[automerger skipped] Merge changes from topic "MusicFx_prostate" into main am: a35f3f45f6 am: 422e3933de am: 21a73c9444 -s ours

am skip reason: Merged-In I552e0b0eb06733e95c7d01be57b66774443b7076 with SHA-1 ec338c0e41 is already in history

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

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