Merge "Have turbulence noise play together with ripple on UMO button click."...

Merge "Have turbulence noise play together with ripple on UMO button click." into udc-dev am: d401bb91 am: 3983ba76 am: 5506c5d2 am: ad47ac33

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



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