[automerger skipped] Merge "Update config according to insets of status bar"...

[automerger skipped] Merge "Update config according to insets of status bar" into tm-qpr-dev am: 1dc53459 -s ours am: 5b8c6bab -s ours am: 3b323b44 -s ours

am skip reason: Merged-In Idaa7280ed23076b3282c987a249259e0c38b6630 with SHA-1 e3d243d3 is already in history

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



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