Merge "Add the new xml config values for content protection service" into...

Merge "Add the new xml config values for content protection service" into udc-qpr-dev am: fe62ffde

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



Change-Id: Ibfd58a953be4c8f54b01bbee0a9bf8444ec33aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>