Merge "Exposed CDMA SID/NID get APIs" am: 0cb936a855
am: 46ffa48122

Change-Id: I4693b44d59a312def9f26ad54badd5533cd36dfd