Merge "Update owners file" am: 8ce39879cf am: 49dd528c4f

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

Change-Id: I184d11b316092c105208a151d4aad629f659468e