[automerger skipped] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 18e7dedf6c am: 5e3ef6a1ea am: 4ff24d34d3 am: 6b830afbad -s ours
am: 57d8952d3c -s ours
am skip reason: change_id I36521fa43daab399e08869647326a7ac32d1e512 with SHA1 569ac173c1 is in history

Change-Id: Id8ec5bdb98faf287e65ad9e8f64bd8e7cd6813d5