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 am: e5e4d0b8

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

Change-Id: Iecf3954230f73ebd539df86efe62a33bc50ee404