Merge "Better return value checking" am: 8fc16d0e am: 4807106b am: 6d186851

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



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