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

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

Change-Id: Ic6ad221e6102a81333deb49b0ca33b3b9a4067a3