Merge "Fix typo in return value" am: 460553099f am: 42c5bc9618 am: 1816240d15

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

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