[automerger skipped] Merge "DO NOT MERGE: Disable resume for guest session if user is ephemeral" into qt-dev am: 40cff7025a am: ac3256a485
am: 55f2be1482 -s ours
am skip reason: subject contains skip directive
Change-Id: I16213238cc49b8a79de0eda3ef0b252dc42912ac
This commit is contained in: