Merge "Remove clearkey hidl code" into udc-dev am: cb658d7a am: 9373918c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/21960430



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