Merge "Update OWNERS for internal Chooser and Resolver" am: ca0ef0a2db am: a6dc900744 am: bf029f7c95

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

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