[automerger skipped] Merge "devicepolicy: use typed List<String> in AIDL" am: c2cbf5d420 -s ours am: e5fc82b092 -s ours

am skip reason: Merged-In I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904 with SHA-1 07db6330cb is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1801773

Change-Id: I35004121989ce784718007ff2955d603d340ca97