[automerger skipped] Merge "Allow a list of configs to be sent for enterprise slice" am: 78bc18e26b am: 92a2654e17 am: cbeda1b1c3 -s ours am: 8ac915e621 -s ours
am skip reason: Merged-In I82c159843d0806cbfc5eea602fbd0304e7ff04ac with SHA-1 00e3dabd76 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019626
Change-Id: Iad9c77be06dbf17640730b0f3ef3c532bf8c4c05
This commit is contained in: