Merge "DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest" into marshmallow-cts-dev am: 931d269533  -s ours am: ac6ca3b3b5 am: c4c2ed9ad4 am: c8134f9a5a
am: 50b94dfd72  -s ours

* commit '50b94dfd72838742e4eec01a1cd5c18aefb49282':
  DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest