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

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

Change-Id: I0a01756586637f4114b6b127654f9062e4303aee