[automerger skipped] Merge "Update OutputTest due to DisplaySettings changes"...

[automerger skipped] Merge "Update OutputTest due to DisplaySettings changes" into tm-dev am: 97b8968e am: 9ca1374d am: a593324f am: 99b88140 -s ours

am skip reason: Merged-In I4d4be852a271d08be130e2c539431eae769021e3 with SHA-1 f6280bb9 is already in history

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



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