Merge "Add opt-out property for force resize override" into udc-dev am: ce96f697 am: 342c0af6

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



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