[automerger skipped] Merge "Set display size to all displays" into tm-qpr-dev...

[automerger skipped] Merge "Set display size to all displays" into tm-qpr-dev am: 7b0b64a5 am: e4bb5384 -s ours

am skip reason: Merged-In I3d6858a9b20798c2ad3b12a66db3484491682691 with SHA-1 e62be136 is already in history

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



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