Merge "Clear up permission READ_PRIVILEGED_PHONE_STATE." am: 07acec49ed am: e4ec8c7944

Change-Id: Ibc4381f8b13551b49404f92717dba369086b9224