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

Change-Id: I357f89c8d8ab7032710063e5cd6d2f761c9e1bb4