Merge "DO NOT MERGE Don't leak `this` out of GraphicBufferSource ctor am: 6301f88251 am: 188e7dbd05 am: 393436e351 am: 5c87e1dab9 am: ea5576c980  -s ours am: c2c3e7cb5c" into oc-dev-plus-aosp