[automerger skipped] Clean up ownership in frameworks/av/ am: fd124e4e55 am: eaa689fdc5 -s ours

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

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

Change-Id: Ie7fd80795cdf8947dce4fb3782393031b5ca6264