Merge changes from topic "noise-ripple" into tm-qpr-dev am: b363fa61

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



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