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

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

Change-Id: Iba02e5a7e7936e93923fcd891a91be9e874888a0