Merge "Fix flakiness of testDisplayChanged" into stage-aosp-sc-ts-dev am: c45d9db02f am: 9e69adb9a7 am: d1acc98e3e

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

Change-Id: I75bd407dcf02b32d3983db7b6a0e0bac27be9977