Merge "Revert "Disable READ_PHONE_STATE fix for beta 1"" into rvc-dev am: 79b319e142

Change-Id: I33f83d2a18448e4fa17abcab6ad8214360dec8d4