Merge "Have turbulence noise play together with ripple on UMO button click." into udc-dev am: d401bb91 am: 2ea7fa75

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



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