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

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

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

Change-Id: I6258d5b083d660a7dca537ddb4de601c372e2383