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

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

Change-Id: Iac224a8b8d586c20deffdfaf93e2d541bc80cefd