[automerger skipped] Break cyclic binder dependency am: 90b4808e -s ours am: 5d4de0a6 -s ours

am skip reason: Merged-In I981b9230589677cc559af4cc89c1e3643ea215f7 with SHA-1 b3d329c2 is already in history

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



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