Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  sonivox: prevent infinite loop in OTA ringtones
  sonivox: fix hang caused by bad meta-event

Change-Id: Ic2746a791f22a84c32d8c9bf63fa5eb8dd9f28f7