[automerger skipped] Merge "Remove clearkey hidl code" am: 0c108c9f am:...

[automerger skipped] Merge "Remove clearkey hidl code" am: 0c108c9f am: 3b8fdc65 am: bb0888bc -s ours am: 320dc795 -s ours

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

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



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