am 2fd32ce7: am 0b46699b: am 1154fff7: am e887a765: Merge "Fix AudioPolicyBinderTest test_isStreamActive" into klp-dev

* commit '2fd32ce798088d4b26b097991ce9498de3aa5667':
  Fix AudioPolicyBinderTest test_isStreamActive