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

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

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



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