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

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

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