Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated." am: e2a486a7b2
am: 55c3b4a993

Change-Id: Icb80c34bf81ec882d7da7b47afc7f7853059846e