Merge "libeffects: Fix saturating add function" am: 28a7e9413e am: 38a8de1e32

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1543473

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16ad5c1f38dd306ac070649c43949999d7da6287