Merge "Respect dpi from Emulator" into tm-dev am: 90251c75 am: 7d92188e

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



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