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

* commit 'c22d307199cad2aad6e57bc98c41bbbe617b97f2':
  Fix AudioPolicyBinderTest test_isStreamActive