Merge "Validate forced display size from settings" into udc-dev am: a8d94a19...

Merge "Validate forced display size from settings" into udc-dev am: a8d94a19 am: ce9d5709 am: a182a0c8

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



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