Merge "Update TelephonyManager#getNai docs for new device ID requirements" am: 2cf7b94daf am: 5e2a0a3321

Change-Id: I9372e5280310bed09b1247b42f7d2c304894a83d