Merge changes from topic "am-50f43ad525e5485685514546a1930347" into rvc-qpr-dev-plus-aosp

* changes:
  Merge "[DO NOT MERGE] Add setting custom MediaButtonReceiver" into rvc-dev am: 2ad21ed9dd am: acd84f39fa am: 4184badc95
  [DO NOT MERGE] Add setting custom MediaButtonReceiver am: 7d8d596370 am: f9992179c7 am: 99a348c706