Merge "Add team members to core/res/OWNERS" am: 06413eea7a am: b3bb81d3fc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie96fed4f5b813af16847d8c9a28b8a53f990f960