Merge changes from topic "media_delete_intent_rvc_qpr2" into rvc-qpr-dev am: d4659de4

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

Change-Id: Ib4292367ad2b1cdbe860039a3cfe29face8ce65c