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

Merge "[2/n] Optimize user aspect ratio button heuristic" into udc-qpr-dev am: 54234fea am: 2b2a3ff2

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



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