[automerger skipped] Merge "Update owners file" am: 8ce39879 am: 49dd528c...

[automerger skipped] Merge "Update owners file" am: 8ce39879 am: 49dd528c am: a2ed390f -s ours

am skip reason: Merged-In I2f537aaf1faec1dce65a3041da8b13e15ed96057 with SHA-1 d54dbad7 is already in history

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

Change-Id: Ic8067ff3ed7c2b3081e9ebaa7ead44c12020c3d6