[automerger skipped] Merge "Fix the string reference equality comparison in...

[automerger skipped] Merge "Fix the string reference equality comparison in MusicFxHelper" into 24D1-dev am: bc49e436 -s ours

am skip reason: Merged-In I996951c7f71678c76afec78efd452b275f17213e with SHA-1 52c9b652 is already in history

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



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