Merge "devicepolicy: use typed List<String> in AIDL" into sc-dev-plus-aosp