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 am: b0d78529

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

Change-Id: I1a79cb8fb5e875c16ecc76bf33b3a33890e4e44b