Merge "Fix "Remove Guest" option shows "Reset Guest" dialog" into tm-dev am: a5f29f2e

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



Change-Id: I45eda3798a1359863ab8f92bd222d77df949f4ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>