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: If9c778731b3f0bcb86993e12c5c8bb647e7c48c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>