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

[automerger skipped] Merge "Refine system bar position restoring" into rvc-d1-dev am: 6383ac86 -s ours am: 4bb7c657 -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: Ic9e7d113c1b5db1f1d2fc3b9e1f09abd68e13c2d