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: b817e507 am: 2094637f am: e0dd096a

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



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