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

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

Change-Id: Iaab25cd31e1254c1e2cae5051fb2eefd8cc519c4