am 2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev

* commit '2c7029902961772a1531b6502e4fb45a3e6fb76f':
  Fix logic in fallback ringtone handling