Merge changes from topic "display" am: b762c9e6d1

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

Change-Id: Id8aaf9c346b9621422ead8185651cc5c06d0e496