[automerger skipped] Merge "Add device identifier permission checks to TelephonyPermissions" am: 1ca89a995b am: 43f45f94d0 -s ours
am: b3a7b953bc -s ours
am skip reason: change_id I3c82c53ec89cd17b34a61166ccc9e9747388efac with SHA1 6d20d75e9e is in history

Change-Id: Iecafe0cb4fbe18af48d23a2829e01bc5a37e0b2e