Merge "Clearkey PRODUCT_PACKAGES makefiles" into tm-dev am: 2ba33e9a am: c01b3b07

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



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