Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc am: 5d7bb383b8 am: 50843b1708
am: 15912efe72

* commit '15912efe72fe27d9ce212d203227687fe8d98867':
  Check permissions on getDeviceId.