Merge "Permission READ_PRECISE_PHONE_STATE implementation polish" am: 2b8cb12004 am: c26846fe67

Change-Id: I27376bd5c29eef8974fac0936f528953bc8cec1b