[automerger skipped] Merge "Prevent sessions from resuming once boot is completed" into rvc-dev am: 4c11355e08 am: b0c34b33c1 -s ours
am skip reason: Change-Id I99337ea2898cfdf2cc515819b4f5b5db4b038f31 with SHA-1 a922531124 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11837601
Change-Id: I723098cb6e6b978a667f1ab86fa948e696bf8a53
This commit is contained in:
committed by
Automerger Merge Worker
commit
d02830e2dc