[automerger skipped] Merge "Apply new device ID access requirements to getNai"...
[automerger skipped] Merge "Apply new device ID access requirements to getNai" am: dcc0458a am: a44fe815 am: 1a9a85f8 -s ours
am skip reason: Change-Id I0f6d17049ccccd3d82f6f49ba2302c013a80f1ae with SHA-1 9957d649 is in history
Change-Id: I9adeb9eb6d42ac7f3120c5b84a3db0736ca64285