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

Merge "Merge "Add opt-out property for force resize override" into udc-dev am: ce96f697 am: b817e507 am: a4f6a21d" into udc-qpr-dev-plus-aosp am: 132d3694

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



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