Merge "Fix typo in return value" am: 46055309 am: 42c5bc96 am: 1816240d...

Merge "Fix typo in return value" am: 46055309 am: 42c5bc96 am: 1816240d am: 87b781f8 am: 29fc6fba am: e53a0032

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



Change-Id: I51bdc21d26d2d70b5c5cf556cddaf179c921bb10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>