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

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



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