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

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

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



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