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

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

Change-Id: I9b15569ab295ae5ff602573eafa769b151dc03e1