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

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

Change-Id: I707c029ac2ed1b540625a0089ee33c7258145373