Merge "Expose Image and Plane for testing" am: 56804f0560 am: ce1dd0aafd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463664

Change-Id: Ib1beca7fcfb3d0d512828e04a6ebf12dea6d3920