Merge "Replace containing aspect ratio hard comparison with rounded one" into...

Merge "Replace containing aspect ratio hard comparison with rounded one" into tm-qpr-dev am: 4677d90f am: 866b9a9f

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



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