[automerger skipped] Merge "[DO NOT MERGE] Add setting custom...

[automerger skipped] Merge "[DO NOT MERGE] Add setting custom MediaButtonReceiver" into rvc-dev am: 2ad21ed9 am: 7f2fb0b2 am: 402b034c am: 7c1fd6a7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2bd9f749e2efead590ffa05a0aafac96c993930f