Merge "Merge "Prevent causing insets if the system bar is shown forcibly" into rvc-dev am: b979998eb4 am: 57328f488d" into rvc-d1-dev-plus-aosp am: 70528d66c3

Change-Id: I40f6e8b37675694aef8638d089cf8625754216af