Merge "Update owners file" am: 8ce39879cf

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

Change-Id: Ibd821918b482407670a5f9ccbe07b940a5323c12