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

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

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



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