[automerger skipped] Merge "Refine system bar position restoring" into...

[automerger skipped] Merge "Refine system bar position restoring" into rvc-d1-dev am: 6383ac86 am: 606a4534 -s ours am: 7568aca6 -s ours

am skip reason: Change-Id Idef314dfe6625399b88b3dacb4c74c7071453497 with SHA-1 533682eb is in history

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

Change-Id: I0a2490c632f309ee6d653e333b02bbfabc59c3ad