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

Change-Id: I25190e4182f23b448019af1ebc8e6fd6c56db05e