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

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

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

Change-Id: I8755800d97def9013b7f3a97f2a455537a71b285