Merge "Add READ_PRIVILEGED_PHONE_STATE to the settings whitelist" am: 62a1827a74 am: ecc0fce03b

Change-Id: Id6e1be7065f08eb917109b59b3c9e57a9f390322