Merge "Fix unbind service error for MusicFxHelper" into main am: 52a3a399de am: 3917932a75

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

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