[automerger skipped] Merge "Remove clearkey hidl code" am: 0c108c9f16 am: 3b8fdc6525 am: bb0888bccf -s ours am: 320dc795d8 -s ours am: e0aa90d595 -s ours

am skip reason: Merged-In Iffe9e8db67a94fbae89108fc0c2dc0acfd7dae42 with SHA-1 21e0a6e872 is already in history

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

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