Merge "Add READ_PRIVILEGED_PHONE_STATE to the settings whitelist" am: 62a1827a am: ecc0fce0 am: a37eb5be Change-Id: Ibd665a4f147b05a97328db2f38dd5ce5a19e7635