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

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

Change-Id: I6c585a021eb1d4ea6c192426f669e2cac694b853