am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-dev

* commit '6b52d191f96c611b768318eec74d25908da76d03':
  DO NOT MERGE - audio flinger: fix fuzz test crash