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: Icf66fa17216dfd0a8a0cdb7c4b48c43f5cb064b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>