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: 46922c26

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

Change-Id: I3054c49cb04ace38b4072d3fc43cb3e635d02246