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

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

Change-Id: I799976228b4fa5ba9942fe766257389d434afe19