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

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



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