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

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



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