tree 635412a4e0fa7a7f9c4a730c7c95623bb8937775
parent 9624d834836b90a3fd7c609328d84706319f2932
parent 03bc1f9b3a2033c58084e2ccde9864fd973f4457
author Amit Mahajan <amitmahajan@google.com> 1549585342 -0800
committer android-build-merger <android-build-merger@google.com> 1549585342 -0800

Merge "Include phoneId as extra when subId is not available." am: 7299401e81
am: 03bc1f9b3a

Change-Id: I967df310fe65a355a6ed79b8464b34981614efbf