Merge "OWNERS: match the adb JNI with the adb Java owners." into main am: 65f47a30cf am: 7b14b13872

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

Change-Id: I9ce004f6fc8c28835e3fdd590ad32aaa7166bf73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Exempt-From-Owners-Approval: Fixing conflict in OWNERS file