Merge "Better OWNERS for system_messages.proto" am: 74a44839b9 am: d283ac489f am: 10fb42f313 am: 317f7a4e35

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

Change-Id: I9829a09224c4adf4e751e83fd0ee75d311dcfc22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>