Merge "Verify staged session remain unchanged on system server reboot" into...

Merge "Verify staged session remain unchanged on system server reboot" into rvc-dev am: 9cf5156f am: b54c17b2

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

Change-Id: I0490d1aa914d4075d2146a77fe5534c7831c7966