Merge "Avoid 60ms QS inflations on UI thread after density changes" into udc-qpr-dev am: 72ac76b7

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



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