Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d am: c99c41781c
am: b5f6115092

* commit 'b5f611509276516eb26d86fe63e845b7148bec86':
  Check permissions on getDeviceId.