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

[automerger skipped] Merge "Fix the string reference equality comparison in MusicFxHelper" into main am: 9f83523d am: 567e7995 -s ours

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

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



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