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: e3d540ea

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



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