[automerger skipped] Rely on Display#getRealSize when dumping XML hierarchy am: 74184991 am: 90075dd1 am: 240d62f7 am: 071bddea am: a0f601fc am: 0a7d0041 am: 43da742f -s ours am: 2df7db6a -s ours am: 4a9fd7bd -s ours

am skip reason: Merged-In Iba21245c947cec0d0054f6d86e3585ba73233223 with SHA-1 afebeb7b is already in history

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



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