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

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



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