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

Change-Id: Ie82744f9ba219d531481c8142f773a5084119905