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

* commit '6e14f9bc9086edf1112ea5e7f5f010251b65f926':
  Fix logic in fallback ringtone handling