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

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

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



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