[automerger skipped] [DO NOT MERGE] Fix logic for storing MediaButtonReceiver am: 9db9306e am: aa512037 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie8849eb2cecd094f313c1860d829c6b5f4ac0f80