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

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

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

Change-Id: Ibe238ad0fa1c646091336ea9b9ae5952c548edb4