Merge "Play turbulence noise only when it triggers playing music." into udc-dev am: 5b506be7

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



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