Merge "Update OutputTest due to DisplaySettings changes" into tm-dev am:...

Merge "Update OutputTest due to DisplaySettings changes" into tm-dev am: 97b8968e am: 9ca1374d am: a593324f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18164063



Change-Id: Ic2ac1ce24809573f3a4ca01b627beaee16b0d17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>