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

Change-Id: Iad18219db56ba610902e4b4d0aa8eaa4c0a30f49