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 am: 6a0ff25f" into rvc-qpr-dev-plus-aosp am: 7034afae

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

Change-Id: I90e0bb48d8bdd26721af22b73d71e789853b9011