Merge "Add opt-out property for min aspect ratio override" into udc-dev am:...

Merge "Add opt-out property for min aspect ratio override" into udc-dev am: d7c7a148 am: fd6b29a0

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



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