Merge "Support enforce READ_PRECISE_PHONE_STATE permission" am: ce1371e2d2 am: 64ed792754

Change-Id: I0f69a6e3fd84db617468b49f9a4c8fb45fa572f7