Merge "av: fix static analyzer complaints" am: 9d2dc23f7b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ea8546ab92e294e3198b335c43b84021cf1976d