Merge "Remove guest after "Reset guest" is used in QS" into sc-dev am: a379ce3b am: c7fe30ee

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

Change-Id: I5f912670366ee3678438eeac355dcdad166e62e7