Merge "Revert "Add method to enforce READ_PRECISE_PHONE_STATE permission""
am: 85bb788795

Change-Id: I4f7729d23984905da3f9c16f876e80be47a9e21b