[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 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: If33161897ee4db17ca65bada99d9b1fd91c9fd97