Merge "Clean up ownership in frameworks/base/" am: c875fc5613

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

Change-Id: I14566099250b2630a4146abd47862585e5e52fa1