Merge "Check ongoing flag for media control dismissal" into tm-qpr-dev am: f5fb9c63

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



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