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

Change-Id: Ic824e7e2637702c2193faff3ef4a2be392223fac