[automerger skipped] Merge "C2BqBuffer: Remove detach during migration" into...

[automerger skipped] Merge "C2BqBuffer: Remove detach during migration" into tm-dev am: 64bde7ce am: 8e5ebada -s ours

am skip reason: Merged-In I46cf14e7e71e35a5982d8073707bbbf558be9be6 with SHA-1 d42e37bf is already in history

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



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