Android 6.0.1 release 18
DO NOT MERGE Check permissions on getDeviceId.

This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I72f3456a2774a7ad5104424daea9e046ee9c6360
(cherry picked from commit d8231b9f37b8a4b9eb160c7e8aae0105c978fc11)
2 files changed