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

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

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



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