Merge "[User Switcher] Remove callback in onDestroy" into tm-dev am: ebf92a1a am: 08bba494

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



Change-Id: I8be44c3274c962d39dfdb58b88596b130189f919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>