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

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



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