[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: acd84f39 am: 4184badc am: 5080bca1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9e3dda1f37f0f17d3ef834cd85f7633faeaca39c