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

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

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