[automerger skipped] Merge "Merge "Skip RAT type listener registration if IMSI...

[automerger skipped] Merge "Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c764 am: d74c016c" into rvc-qpr-dev-plus-aosp am: 0c87e533 -s ours

am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 6afd939b is in history

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

Change-Id: I3dc4e0b8953dd51dea6233af6e71d1921d497b25