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

* commit 'd9c6add8383b5c936b584ad38f53b95c9b44b497':
  Fix AudioPolicyBinderTest test_isStreamActive