Merge "Require READ_CALL_LOG permission to see phone numbers in phone state." am: b1b864cee2
am: 6a8b23774e

Change-Id: Ia26cd1ed4693d67b9d54cf25e227bf349d0b04e3