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

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

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



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