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: 012fc1cc am: b01fd5e2

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



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