Merge "DO NOT MERGE Sonivox: add CTS test." into lollipop-mr1-cts-dev
am: 77eb5ea  -s ours

* commit '77eb5eaea6a8b426879c2511b90680e2ad18dbc2':
  DO NOT MERGE Sonivox: add CTS test.

Change-Id: I75766d9e423f59a3317699517b1edfeb832dc31a