Merge "Revert "Revert "Add method to enforce READ_PRECISE_PHONE_STATE p...""
am: 55f9664eb3

Change-Id: I08c3f2d1ae5f117fcb3d6187356511bb9db49980