Merge "Clean up ownership in frameworks/av/" am: c379052f4a am: 0a25665fc7 am: d6d5f88213

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

Change-Id: Ia09a9eea0a843ef778d05d266566788c7b040bfb