Merge "DO NOT MERGE - improve audio effect framwework thread safety am: bc7f347ff5 am: 068881e79c am: 35912764e9 am: d9e0deef93  -s ours am: 7bb8e04c67 am: 851361eda0 am: 43d30448c2 am: eea5d5d23a am: f4aaaf6ca7" into nyc-mr2-dev-plus-aosp