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: 045b10c4

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



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