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

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

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