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

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



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