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 am: 158ee35c

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



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