[automerger skipped] Merge "Add more owners of API directory" am: 90bb7792...

[automerger skipped] Merge "Add more owners of API directory" am: 90bb7792 am: 57e9dd62 -s ours am: 4599d438 -s ours am: ecf6026f -s ours

am skip reason: Merged-In I97802b98d24309759f9cf5d3192da6b80dc7657b with SHA-1 f5da22e7 is already in history

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

Change-Id: I478dda1fba106978aafddaffa9751ec513818737