Merge the 2019-01-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  sonivox: prevent rejection of good but large MIDI files
  sonivox: prevent infinite loop in OTA ringtones
  Revert "sonivox: prevent infinite loop in OTA ringtones"

Change-Id: I7392bc736d7f941254089f3de63b1ded28b770e6