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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf0ca20b96cc4c1af98c07aad3cee951bf26b660