[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: b0c34b33 -s ours am: d02830e2 -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: Ia596adc1dec83c51080ab7dddae330e38c3f21d2