Merge "Unregister broadcast receiver when user removed" into main am: 3820160a am: 5a79df55

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



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