Merge "Revert "Separate hdcp levels into a base interface"" into...

Merge "Revert "Separate hdcp levels into a base interface"" into android15-tests-dev am: ed1087ed am: 65b88061

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3287590



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