Merge "Add method to enforce READ_PRECISE_PHONE_STATE permission"
am: 1be136dac6

Change-Id: I766af9b2b0b439924a678886cd934a54a3c3194e