[automerger skipped] Merge "Break cyclic binder dependency" into udc-qpr-dev am: 41b08059 -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: Id7769b86c6d631fc95ca8df74f4cc6c6deb85d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>