Merge "devicepolicy: use typed List<String> in AIDL"