Merge "Pruning departed users from OWNERS" am: b77890ae5e am: ebeefc7ebe

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946368

Change-Id: Ieb884e91aedb0ce524155135d34d271da1681107