Merge "SF: Fix emulator DPI" into rvc-dev am: 4b9467baec am: 43825ca25c

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

Change-Id: Idd7113f284e4aecff98dc23a6f45639d54e34cbe