Rename deviceId to persistentDeviceId

Name device Id and persistent device Id carefully
in the classes where both ID are used.

Bug: 289355341
Test: local build
Change-Id: I7b5c2063cf60500bbcd293cc76b4979bc08bf1ee
3 files changed