Merge "Add device identifier permission checks to TelephonyPermissions"
am: 1ca89a995b

Change-Id: I7f6d821d6596cf24960b2b136ff03b5e23ca5382