Merge "C2BqBuffer: Remove detach during migration" into tm-dev am: 64bde7ce

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



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