Merge "Merge "Correct return codes in documentation" am: 6439a233" into...

Merge "Merge "Correct return codes in documentation" am: 6439a233" into stage-aosp-master am: 248be69b am: 251710c1

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



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