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