Merge changes from topic "display" am: b762c9e6d1 am: e6ff2b338e

Original change: https://android-review.googlesource.com/c/platform/cts/+/1486580

Change-Id: Ib7a4a8db19c1d450d5227d63f2055ac35722f426