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

Change-Id: I4ccc56384bf910dce6be18218b7166e4047442ae