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

Change-Id: I1355f6b269eebee486d5f51c9f3261ba01d8efb8