Merge "CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker" into marshmallow-cts-dev am: 0cbbf64216 am: e0f81ff2a8
am: 9e7616ffb1

* commit '9e7616ffb1124ae2534ace7dabd09916240d63cf':
  CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker