Merge "Fix physical display ratio incorrect" into tm-dev am: e266bac2 am:...

Merge "Fix physical display ratio incorrect" into tm-dev am: e266bac2 am: f89fbd08 am: a45fe071

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



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