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

Merge "[automerger skipped] Merge "Refine system bar position restoring" into rvc-d1-dev am: 6383ac86 -s ours am: 4bb7c657 -s ours" into rvc-qpr-dev-plus-aosp am: a9f72de7 -s ours

am skip reason: Change-Id Idef314dfe6625399b88b3dacb4c74c7071453497 with SHA-1 444e8dc6 is in history

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

Change-Id: I439a02ee06a73bbd377aff796aa7b23772aa9014