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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35dae3f53d34a1fb0628503857659bf394e07779