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

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

Change-Id: I371fb6bc7c541e70b73e34df54319106eac56c6f