[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 am: d7f0b9dc -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: Ia0cc32f91e3f010f99be279d6f6355c41dcca940