Merge "devicepolicy: use typed List<String> in AIDL" into stage-aosp-master