Merge "Fixing white circle in QS media player." into tm-qpr-dev am: b66710bb am: 6dc609bd

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



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