Merge "Break cyclic binder dependency" am: 3d87c778 am: a076a721 am:...

Merge "Break cyclic binder dependency" am: 3d87c778 am: a076a721 am: 9d005f29 am: ca5c73c4 am: a2da5ab1

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



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