Merge "Fix BroadcastReceiver leaked during user switching" into tm-dev am: 6fc0f7ba

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



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