Merge "Transform displayMetrics if needed" into udc-dev am: 0f542678 am: ad5e58a8

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



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