Merge "[1/n] Optimize user aspect ratio button heuristic" into udc-qpr-dev am: 4b539568

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



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