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

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

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