Merge "Revert "[RESTRICT AUTOMERGE]: Revert "CTS Tests for sonivox bugs b/68664359 and b/110435401""" into qt-dev