Merge "DO NOT MERGE: Disable resume for guest session if user is ephemeral" into qt-dev am: 40cff7025a
am: c75a1e0708

Change-Id: I5123cecdb492102470a7d99014edc9d72d8ddd90