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

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

Change-Id: I083f5358de92542a0658d348871a969ba69c9078