[automerger skipped] Merge "Refine system bar position restoring" into rvc-qpr-dev am: 1adfc8b8 am: efee1a6b -s ours

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

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

Change-Id: I8117bfff98afa6dfa9fdcac3af4b181579126ee7