Merge "Remove a seam from media TTT ripple." into tm-qpr-dev am: 55f11aac91 am: 97cbc5302c

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

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