Merge "Take content protection ownership" into main am: 9a9dae8af2

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

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