[automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: b74cd6eb am: 64966764 am: 5a4238cd -s ours

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

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

Change-Id: Iff9fe875b4e12d837e5fe52f956ff0f13d3c6ce3