Merge remote-tracking branch 'aosp/upstream-master' am: 0bd76d957c am: 8f7d2e1166 am: f88d51ab47 am: 1654b9d665

Original change: https://android-review.googlesource.com/c/platform/external/rnnoise/+/1354027

Change-Id: Iab48cee23379297cd12055d19d998279cb6cab0e