[automerger skipped] Merge changes from topic "media_delete_intent_rvc_qpr2"...

[automerger skipped] Merge changes from topic "media_delete_intent_rvc_qpr2" into rvc-qpr-dev am: d4659de4 am: 1c7502c1 -s ours

am skip reason: Change-Id Iebb4f113d73179d7314ae1c6db3856ee0fd10b07 with SHA-1 c1b65c73 is in history

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

Change-Id: I4300590c299beb214e3b0a9363829bb5a10b4e7d