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