Merge "Update compat owners." am: 39bf2ed7e5

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

Change-Id: Iaee345c2cafab863351dedef7d6ee1442ea5fbb4