Change getDeviceId to take phoneId.

bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5
2 files changed