[automerger skipped] Merge "Update TelephonyManager#getNai docs for new device ID requirements" am: 2cf7b94daf am: 5e2a0a3321 am: 30496f4c57 -s ours
am skip reason: Change-Id I99aa929ce7c734d9449fe23f6f483af4463fed19 with SHA-1 248a6b38f2 is in history

Change-Id: I02c47ee76e51703807f8ec491afd2213faf5d762