am 5e36df02: am 39291f60: am 81a0690f: Resseting volume button to "do nothing" on upgrade

# Via Android Git Automerger (2) and Isaac Katzenelson (1)
* commit '5e36df02424cf9657296d8de05a26981e95398e8':
  Resseting volume button to "do nothing" on upgrade