Merge "Fix guest icon is not clickable after adding user" am: a35917822d am: f9fb9f6983 am: db5bc807a0 am: fd9473a037

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1452495

Change-Id: I51c5114750ee1a64ec564204667c72e13ae98d4e
diff --git a/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/UserGridRecyclerView.java b/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/UserGridRecyclerView.java
index 023b5b4..6d63e31 100644
--- a/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/UserGridRecyclerView.java
+++ b/packages/CarSystemUI/src/com/android/systemui/car/userswitcher/UserGridRecyclerView.java
@@ -567,6 +567,9 @@
                         Log.e(TAG, "Failed to switch to new user: " + user.id);
                     }
                 }
+                if (mAddUserView != null) {
+                    mAddUserView.setEnabled(true);
+                }
             }
         }