Merge "Adding OWNERS in `android.server.infra` package" am: 7a25b6f379 am: a52e412644 am: 36b11e824e

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

Change-Id: Ie3a3de0288ebd17fa8cabcb1d48b99fdcdd21a17