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

Change-Id: Ia4380a4d25dd88243f123eb48b36bd3d94cfbb32