[automerger skipped] Merge "Revert "Separate hdcp levels into a base...

[automerger skipped] Merge "Revert "Separate hdcp levels into a base interface"" into android15-tests-dev am: ed1087ed am: 65b88061 am: 296116cf -s ours

am skip reason: Merged-In I9e90ada03144b49245dc6b55a0fb2fa2eb6f3893 with SHA-1 e5e76c73 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3283232

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



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