Merge "C2BqBuffer: Remove detach during migration" am: 0ef532f9 am: 216c3832 am: 76e6d9c7

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



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