Merge "Clean up ownership in frameworks/av/" am: c379052f4a am: 0a25665fc7 am: d6d5f88213 am: 5db490c043 am: 5411b03507

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

Change-Id: I7d72f0c4cea951ae0336a231c2d3f5f76e755d67