[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: c75a1e07
am: 12ead975 -s ours
am skip reason: subject contains skip directive
Change-Id: I908f31cbc5976e549f94e6a7d7d4d84f81d6cf15