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: 2b56c552 am: 5e8fd001

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



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