Merge "Switch to 3 framebuffer surface buffers am: 8e28b7d1ec am: 8a3ae62f74" into oc-dr1-dev-plus-aosp