Include phoneId as extra when subId is not available.

Test: basic sanity
Bug: 122819162
Change-Id: Ia55b5550930b1e34e14e46c718261ec11ac56f43
1 file changed