Merge "Merge "Clear TelephonyManagerMap onStop" into udc-dev am: 5a29015e...

Merge "Merge "Clear TelephonyManagerMap onStop" into udc-dev am: 5a29015e am: e3a9b819 am: 52738813" into udc-qpr-dev-plus-aosp am: e7f8119c

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



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