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

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

Change-Id: I6a23db30e3a7f4cb5e0e74112d82a97cb9afc4d4