Merge "Update OWNERS for keymaster Java code" am: 99aeb82ccf

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

Change-Id: I8705108d88acf1b307219b9066527108845e55bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>