Merge "[1/n] Add build and runtime flags to guard user aspect ratio settings"...

Merge "[1/n] Add build and runtime flags to guard user aspect ratio settings" into udc-qpr-dev am: 59589cd9 am: b5afdb7b

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



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