Merge "Deregistering mixes before register mixes in connectMixes" into main...

Merge "Deregistering mixes before register mixes in connectMixes" into main am: 3450b3b1 am: 4c047e92

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3370477



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