Merge "Add a few team members to OWNERS" am: b31faa6cb9 am: 2660226b46

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1949236

Change-Id: I8de785d097b878bed5ed6e65793254247e9a7124