[automerger skipped] Merge "AudioService: do not log sound effects in audio dumpsys" into tm-qpr-dev am: 76f824b2f9 am: e01b666059 -s ours

am skip reason: Merged-In I6fb0289ef3b72e4dd505f9114dd59da174f53238 with SHA-1 dec1a1b6b7 is already in history

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

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