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

Change-Id: I6ed0dcf9932c566e1980e07bc184dc7844228297