Merge "Updating owners in core and in resources" am: 07107bead9 am: bbd0180875

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

Change-Id: Id44beedc753450f4966969e21d8332ddd69da567