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

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

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



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