[automerger skipped] Merge "Fix deadlock in IMMS checking hasNavigationBar"...

[automerger skipped] Merge "Fix deadlock in IMMS checking hasNavigationBar" into udc-qpr-dev am: 8eea66e7 am: 59076607 -s ours

am skip reason: Merged-In I4d7a062a9abeaf59218505d384f94e04e1a8ed74 with SHA-1 d136b9bd is already in history

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



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