Merge "Refine system bar position restoring" into rvc-d1-dev am: 6383ac86

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

Change-Id: I9b1e07559a3194b22d07d7b107d780abc4f1bcc9