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