[automerger skipped] Merge "Prevent sessions from resuming once boot is...

[automerger skipped] Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e am: 84db84a6 am: 2586e1a9 -s ours

am skip reason: Change-Id I99337ea2898cfdf2cc515819b4f5b5db4b038f31 with SHA-1 a9225311 is in history

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

Change-Id: I75d7b0c9ab0ea50faf44c6ecd800cc35ed6ca1b8