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

[automerger skipped] Merge "C2BqBuffer: Remove detach during migration" into tm-dev am: 64bde7ce -s ours am: fff83aed -s ours am: dffefda8 -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: I08c74b99f4fd5018b0f780b11ec7395afc6149fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>