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

Change-Id: Icf8cf1d20e9ac29b21459436a225c0384f8fb7f9