Merge "Make TelephonyManager#getNai() public" am: 4c8fa81d17 am: b731583b7a
am: bdfb401070

Change-Id: I4ccc6be1b0a085dbf85fea94263093b5cb2ba28d