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

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

Change-Id: I7c48d880bff946f8994807775e73d7e1b9b045bc