[automerger skipped] Merge "DO NOT MERGE: Disable resume for guest session if...
[automerger skipped] Merge "DO NOT MERGE: Disable resume for guest session if user is ephemeral" into qt-dev am: 40cff702 am: ac3256a4
am: 55f2be14 -s ours
am skip reason: subject contains skip directive
Change-Id: I16213238cc49b8a79de0eda3ef0b252dc42912ac