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

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

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