[automerger skipped] Merge "Fix DisplayPolicy#isOverlappingWithNavBar" into...

[automerger skipped] Merge "Fix DisplayPolicy#isOverlappingWithNavBar" into tm-qpr-dev am: 4fd0994a am: d115bbaa -s ours am: bb377504 -s ours am: 8c39189f -s ours

am skip reason: Merged-In If216cf2f73615d82129e51fbacc326fd02cbb8f8 with SHA-1 c2e683bb is already in history

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



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