Merge "Try to fix stale mDisplaySize" into tm-qpr-dev am: 6b55fa71 am: 900910e2

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



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