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

Change-Id: Ic56671b8f682312ed727ad4f4e4f06e35fa72591