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

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

Change-Id: Ibf446f235c2af05dd9056b7f1226bb2f10aad4c1