Merge "Unregister broadcast receiver when user removed" into main am: 3820160a3f

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

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