Merge "Mark EXTRA_INCOMING_NUMBER for PHONE_STATE broadcast as deprecated."