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

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

@@ -111,7 +111,9 @@ public class UserSwitcherController implements Dumpable {
     public UserSwitcherController(Context context, KeyguardMonitor keyguardMonitor,
             @Named(MAIN_HANDLER_NAME) Handler handler, ActivityStarter activityStarter) {
         mContext = context;
-        mGuestResumeSessionReceiver.register(context);
+        if (!UserManager.isGuestUserEphemeral()) {
+            mGuestResumeSessionReceiver.register(context);
+        }
         mKeyguardMonitor = keyguardMonitor;
         mHandler = handler;
         mActivityStarter = activityStarter;