Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08

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

Change-Id: I5c04041cb9698ab890fa28e402283d58fb993524