Merge "[3/n] Optimize user aspect ratio button heuristic" into udc-qpr-dev am: f0d77596

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



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