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

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



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