[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 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: Ifcf75168506338665103891b92028583d455655c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>