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: a5f753d4 am: dd5a93ab

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



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