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

Change-Id: I131e8a75183c28e3593ec96b4cfe0cfa6a1c51d2