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

Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e am: 84db84a6 am: 693bd372

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

Change-Id: Iefc085d05fd122171948972272c87819fdcd5b24