Merge "Resolve user switch broadcast in account registry." into udc-qpr-dev am: 8684dc957c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/24134953

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