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

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

Change-Id: I6351cb39f2ae17990e698ab1dd8e8a9da56f01ac