Merge "Prevent system reset staged installer bypass flag unexpactly" into rvc-dev am: 809bf935

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

Change-Id: I1a84ce3d8e8d50136455162e6d01c8a594289b2d