Merge "Do not use stableDisplaySize for scale factor" into tm-qpr-dev am: fa561d39 am: 88d4577e

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



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