Merge changes from topic "MusicFx_prostate" into main am: a35f3f45f6 am: 422e3933de

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

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