[automerger skipped] DO NOT MERGE: Disable resume for guest session if user is...
[automerger skipped] DO NOT MERGE: Disable resume for guest session if user is ephemeral am: 6f9fd448 am: f1af201b
am: c260820f -s ours
am skip reason: subject contains skip directive
Change-Id: Ic8480cde89b6d1124cc9a7c53fd5084841efbbbb