Merge "Merge "Prevent system reset staged installer bypass flag unexpactly"...

Merge "Merge "Prevent system reset staged installer bypass flag unexpactly" into rvc-dev am: 809bf935 am: d03b5017" into rvc-d1-dev-plus-aosp am: 4c5b1d89

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

Change-Id: I2bc267ebd37a82c53d5299d519f2b5a25d36e1fa