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

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



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