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

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



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