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

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

Change-Id: I6180b153ac37a6ca6b275c3974c7abb081f9a628