Merge "Skip RAT type listener registration if IMSI is not available" am: b74cd6eb18 am: 649667642c

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

Change-Id: I34de6bc6dd862f8042489f60f4b6be76af7c961e