[automerger skipped] Merge "Update statusbar insets when switching displays"...

[automerger skipped] Merge "Update statusbar insets when switching displays" into sc-v2-dev am: 2c5de364 am: fccc553a -s ours

am skip reason: Merged-In I6c3ee7eeafd1940902d9b17cbb749ba525ebf97f with SHA-1 c9047248 is already in history

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

Change-Id: Iffbd9ae39df2b196f410b1a1b1f3fded3efbb0bd