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