[automerger skipped] Clean up ownership in frameworks/av/ am: fd124e4e am: 54728279 am: b7457908 -s ours am: 8d65482f -s ours

am skip reason: Merged-In I36049c20a2888cbb7e7f85e82d068976fc68d4d8 with SHA-1 48c83fed is already in history

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

Change-Id: Ib707f0a5051a7af72fff384da310768b8877a642