[automerger skipped] Merge "devicepolicy: use typed List<String> in AIDL" into stage-aosp-master am: 0c08393bf9 -s ours am: 490fe9dbb8 -s ours
am skip reason: Merged-In I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904 with SHA-1 57fe5105df is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15663357
Change-Id: I267508fa525bf1fd7e14df0a38a8098c6c2a3410
This commit is contained in: