Merge "Add opt-out properties for user aspect ratio override" into udc-qpr-dev...

Merge "Add opt-out properties for user aspect ratio override" into udc-qpr-dev am: f79aa84a am: 2ffccb3c

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



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