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

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

Change-Id: I28b01abc3131843217d4c164f30bfad41e350f63