Merge "Refine system bar position restoring" into rvc-qpr-dev am: 1adfc8b85c

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

Change-Id: I23e07b7e45535df955ff56cf98e760e95023bd09