Merge "Play turbulence noise only when it triggers playing music." into...

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

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



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