[automerger skipped] Merge "[DO NOT MERGE] Fix logic for storing MediaButtonReceiver" into rvc-qpr-dev am: 0633bc8e am: 07fcb0ee -s ours

am skip reason: subject contains skip directive

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

Change-Id: I57b4d462bc0da4575b0fa12cdd4962f14682dfc8