[automerger skipped] Merge "Fix unbind service error for MusicFxHelper" into...

[automerger skipped] Merge "Fix unbind service error for MusicFxHelper" into 24D1-dev am: 5a8d897c -s ours

am skip reason: Merged-In Ic519221b2bb7d28e5378a995519f8b3269d03c70 with SHA-1 a3431c7b is already in history

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



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