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

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



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