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

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

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



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