[automerger skipped] Merge "Clean up ownership in frameworks/base/" into...

[automerger skipped] Merge "Clean up ownership in frameworks/base/" into sc-dev am: 88c2fc9c am: bdd1e411 -s ours am: 69f3269b -s ours am: b79896a7 -s ours

am skip reason: Merged-In I04bee764bf50734523ff2210d30ed052dcb036bd with SHA-1 fefe435d is already in history

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

Change-Id: If115bf72910742b65b7885fc8832d92f31a5c48e