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: I092e2b160d4b152915c04f699d930d5b36be184f