Merge "Support enforce READ_PRECISE_PHONE_STATE permission" am: ce1371e2d2

Change-Id: I3719c202f712c50cf07e4127dbd1cae8de28959d