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

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



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