Merge "Remove clearkey hidl code" into udc-dev am: cb658d7a am: 6af47488

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



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