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

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



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