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 am: 6a0ff25f

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

Change-Id: I1e08ca15a164a9a02363b44bd96d5e418681635f