Merge "OWNERS change / new .proto file" am: 6d3fb3d57c am: 6ca6f593a1 am: d34bf7100d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8635a998a94b03dac597b7ab45de99a62488a680