Merge "Merge "Verify staged session remain unchanged on system server reboot" into rvc-dev am: 9cf5156f am: 42a637d4 am: e832a7c0" into rvc-qpr-dev-plus-aosp am: bf0edba2

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

Change-Id: Id1573a74f98490d801a851a827efd4e8981936e2