Merge remote-tracking branch 'aosp/upstream-master' am: 0bd76d957c

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

Change-Id: I839350f6af73ade568dbb69e8f3c0d03a92d027f