Merge "Permission READ_PRECISE_PHONE_STATE implementation polish"
am: 2b8cb12004

Change-Id: I0059c2bb23dc15cfe3eff84118990aa47b8d69d9