Merge "Fix multi user crash when Add guest was tapped multiple times" into...

Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev am: 15d9351b am: 850263d0 am: 3bc6e61a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12108073

Change-Id: I3a474956dd0591bc760ab9aba86fd7476f776eb8