[automerger skipped] Merge "Clear up permission READ_PRIVILEGED_PHONE_STATE." am: 07acec49ed am: e4ec8c7944 am: ae10d0089d -s ours
am skip reason: Change-Id I6c801039e3eaf22bae052de6569cf1d9a5b28396 with SHA-1 feed16dda7 is in history

Change-Id: Ie9ecebbaa7b360f34cbcee5b05fc2ec01560dbff