Merge "Update compat owners." am: 39bf2ed7e5 am: a7e21f7e63 am: 8d8bec0ebe am: 6a34d3ad15

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

Change-Id: I5bcd1d14b415e3b110ef6fece19b005aec231972