Merge "Clearkey PRODUCT_PACKAGES makefiles" into tm-dev am: 2ba33e9a am: 91a14d4f am: 606485e0 am: 38939a2f

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



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