Merge "Clean departed users from OWNERS files" am: fab203cd64 am: 47e5bbab96 am: b8dd2f6359

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

Change-Id: I9817c4a23f3a8f1e0d58bed1cd7158732cd8f5ca