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