From 52b9862f87c70156a6027564cdc478f46ed89e9a Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 8 Dec 2020 08:36:17 -0700
Subject: [PATCH] Improve OWNERS coverage across frameworks/base/.

As general background, OWNERS files expedite code reviews by helping
code authors quickly find relevant reviewers, and they also ensure
that stakeholders are involved in code changes in their areas.

Some teams under frameworks/base/ have been using OWNERS files
successfully for many years, and we're ready to expand them to cover
more areas.  Here's the historical coverage statistics for the last
two years of changes before these new OWNERS changes land:

-- 56% of changes are fully covered by OWNERS
-- 17% of changes are partially covered by OWNERS
-- 25% of changes have no OWNERS coverage

Working closely with team leads, we've now identified clear OWNERS on
a per-package basis, and we're using "include" directives whenever
possible to to simplify future maintenance.  With this extensive
effort, we've now improved our coverage as follows:

-- 98% of changes are fully covered by OWNERS
-- 1% of changes are partially covered by OWNERS
-- 1% of changes have no OWNERS coverage

This specific change is automatically generated by a script that
identifies relevant "include" directives.

Bug: 174932174
Test: manual
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Merged-In: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
Change-Id: I3480ddf2fe7ba3dfb922b459d4da01fa17a2c813
---
 OWNERS                                        |  5 +++++
 apct-tests/perftests/autofill/OWNERS          |  1 +
 apct-tests/perftests/blobstore/OWNERS         |  1 +
 apct-tests/perftests/contentcapture/OWNERS    |  1 +
 apct-tests/perftests/core/apps/overlay/OWNERS |  1 +
 .../core/src/android/accounts/OWNERS          |  1 +
 .../core/src/android/database/OWNERS          |  1 +
 apct-tests/perftests/inputmethod/OWNERS       |  1 +
 apct-tests/perftests/packagemanager/OWNERS    |  1 +
 apct-tests/perftests/textclassifier/OWNERS    |  1 +
 apct-tests/perftests/windowmanager/OWNERS     |  1 +
 api/OWNERS                                    |  1 +
 cmds/am/OWNERS                                |  1 +
 cmds/appops/OWNERS                            |  1 +
 cmds/backup/OWNERS                            |  1 +
 cmds/bmgr/OWNERS                              |  1 +
 cmds/bu/OWNERS                                |  1 +
 cmds/dpm/OWNERS                               |  1 +
 cmds/ime/OWNERS                               |  1 +
 cmds/incident/OWNERS                          |  1 +
 cmds/input/OWNERS                             |  1 +
 cmds/locksettings/OWNERS                      |  1 +
 cmds/pm/OWNERS                                |  1 +
 cmds/sm/OWNERS                                |  1 +
 cmds/telecom/OWNERS                           |  1 +
 cmds/uinput/OWNERS                            |  1 +
 cmds/wm/OWNERS                                |  1 +
 config/OWNERS                                 |  3 +++
 core/java/android/app/OWNERS                  |  1 +
 .../java/android/app/servertransaction/OWNERS |  3 +++
 core/java/android/hardware/display/OWNERS     |  4 ++++
 core/java/android/hardware/hdmi/OWNERS        |  3 +++
 core/java/android/hardware/input/OWNERS       |  4 ++++
 core/java/android/hardware/lights/OWNERS      |  1 +
 .../java/android/hardware/soundtrigger/OWNERS |  1 +
 core/java/android/inputmethodservice/OWNERS   |  3 ++-
 core/java/android/os/OWNERS                   |  4 ++--
 core/java/android/provider/OWNERS             |  6 +++++-
 core/java/android/timezone/OWNERS             |  1 +
 core/java/android/view/inputmethod/OWNERS     |  3 ++-
 core/java/android/window/OWNERS               |  2 +-
 core/java/com/android/ims/OWNERS              |  1 +
 .../com/android/internal/config/sysui/OWNERS  |  1 +
 core/java/com/android/internal/os/OWNERS      |  2 +-
 core/java/com/android/internal/policy/OWNERS  |  1 +
 .../com/android/internal/statusbar/OWNERS     |  1 +
 core/jni/OWNERS                               | 20 +++++++++++++++++--
 core/tests/ConnectivityManagerTest/OWNERS     |  1 +
 core/tests/PackageInstallerSessions/OWNERS    |  1 +
 core/tests/benchmarks/src/android/net/OWNERS  |  1 +
 core/tests/bluetoothtests/OWNERS              |  1 +
 core/tests/coretests/apks/OWNERS              |  1 +
 .../src/android/accessibilityservice/OWNERS   |  1 +
 .../coretests/src/android/database/OWNERS     |  1 +
 core/tests/coretests/src/android/net/OWNERS   |  1 +
 .../com/android/internal/accessibility/OWNERS |  1 +
 .../com/android/internal/inputmethod/OWNERS   |  1 +
 .../src/com/android/internal/policy/OWNERS    |  1 +
 .../src/com/android/internal/power/OWNERS     |  1 +
 .../src/com/android/internal/statusbar/OWNERS |  1 +
 .../src/android/hardware/devicestate/OWNERS   |  1 +
 core/tests/hdmitests/OWNERS                   |  1 +
 core/tests/hosttests/test-apps/OWNERS         |  1 +
 core/tests/notificationtests/OWNERS           |  1 +
 core/tests/overlaytests/OWNERS                |  1 +
 core/tests/packagemanagertests/OWNERS         |  1 +
 core/tests/powertests/OWNERS                  |  1 +
 data/fonts/OWNERS                             |  1 +
 graphics/OWNERS                               |  1 +
 libs/WindowManager/OWNERS                     |  2 +-
 libs/incident/OWNERS                          |  1 +
 libs/input/OWNERS                             |  1 +
 libs/storage/OWNERS                           |  1 +
 libs/usb/OWNERS                               |  1 +
 location/OWNERS                               |  1 +
 mime/OWNERS                                   |  1 +
 .../aidl/com/android/internal/compat/OWNERS   |  1 +
 native/graphics/OWNERS                        |  1 +
 packages/AppPredictionLib/OWNERS              |  1 +
 packages/Backup/OWNERS                        |  1 +
 packages/BackupEncryption/OWNERS              |  1 +
 packages/BackupRestoreConfirmation/OWNERS     |  1 +
 packages/EasterEgg/OWNERS                     |  1 +
 packages/ExternalStorageProvider/OWNERS       |  1 +
 packages/FusedLocation/OWNERS                 |  1 +
 packages/MtpDocumentsProvider/OWNERS          |  1 +
 packages/PrintRecommendationService/OWNERS    |  1 +
 packages/PrintSpooler/OWNERS                  |  1 +
 packages/SharedStorageBackup/OWNERS           |  1 +
 packages/Tethering/OWNERS                     |  1 +
 packages/VpnDialogs/OWNERS                    |  1 +
 packages/WAPPushManager/OWNERS                |  1 +
 packages/WallpaperBackup/OWNERS               |  1 +
 packages/WallpaperCropper/OWNERS              |  1 +
 packages/WindowManager/OWNERS                 |  1 +
 packages/overlays/OWNERS                      |  1 +
 packages/services/PacProcessor/OWNERS         |  1 +
 packages/services/Proxy/OWNERS                |  1 +
 proto/src/OWNERS                              |  2 ++
 samples/training/network-usage/OWNERS         |  1 +
 services/OWNERS                               |  1 +
 services/api/OWNERS                           |  2 ++
 services/appprediction/OWNERS                 |  1 +
 services/autofill/OWNERS                      |  1 +
 services/contentcapture/OWNERS                |  1 +
 services/contentsuggestions/OWNERS            |  1 +
 services/core/OWNERS                          |  1 +
 services/core/java/com/android/server/OWNERS  | 16 +++++++++++++++
 .../core/java/com/android/server/adb/OWNERS   |  1 +
 .../core/java/com/android/server/appop/OWNERS |  1 +
 .../java/com/android/server/attention/OWNERS  |  1 +
 .../java/com/android/server/backup/OWNERS     |  1 +
 .../java/com/android/server/camera/OWNERS     |  1 +
 .../com/android/server/contentcapture/OWNERS  |  1 +
 .../core/java/com/android/server/hdmi/OWNERS  |  1 +
 .../java/com/android/server/incident/OWNERS   |  1 +
 .../core/java/com/android/server/om/OWNERS    |  1 +
 .../java/com/android/server/people/OWNERS     |  1 +
 .../java/com/android/server/policy/OWNERS     |  1 +
 .../java/com/android/server/powerstats/OWNERS |  1 +
 .../core/java/com/android/server/slice/OWNERS |  1 +
 .../java/com/android/server/statusbar/OWNERS  |  1 +
 .../java/com/android/server/storage/OWNERS    |  1 +
 .../com/android/server/textclassifier/OWNERS  |  1 +
 .../com/android/server/timedetector/OWNERS    |  1 +
 .../java/com/android/server/timezone/OWNERS   |  1 +
 .../android/server/timezonedetector/OWNERS    |  1 +
 .../core/java/com/android/server/trust/OWNERS |  1 +
 .../core/java/com/android/server/tv/OWNERS    |  1 +
 .../java/com/android/server/wallpaper/OWNERS  |  1 +
 services/core/jni/OWNERS                      | 15 ++++++++++++++
 services/core/jni/gnss/OWNERS                 |  1 +
 .../core/xsd/platform-compat-schema/OWNERS    |  1 +
 services/devicepolicy/OWNERS                  |  1 +
 services/incremental/OWNERS                   |  1 +
 services/print/OWNERS                         |  1 +
 services/restrictions/OWNERS                  |  1 +
 services/robotests/backup/OWNERS              |  1 +
 .../src/com/android/server/backup/OWNERS      |  1 +
 .../src/com/android/server/pm/OWNERS          |  1 +
 services/startop/OWNERS                       |  1 +
 services/tests/PackageManager/OWNERS          |  1 +
 .../OWNERS                                    |  1 +
 .../assets/AppOpsUpgradeTest/OWNERS           |  1 +
 .../src/com/android/server/OWNERS             |  1 +
 .../src/com/android/server/alarm/OWNERS       |  1 +
 .../src/com/android/server/am/OWNERS          |  1 +
 .../src/com/android/server/appop/OWNERS       |  1 +
 .../src/com/android/server/blob/OWNERS        |  1 +
 .../src/com/android/server/display/OWNERS     |  1 +
 .../src/com/android/server/job/OWNERS         |  1 +
 .../src/com/android/server/power/OWNERS       |  1 +
 .../src/com/android/server/usage/OWNERS       |  1 +
 .../src/com/android/server/wallpaper/OWNERS   |  1 +
 services/tests/servicestests/apks/OWNERS      |  1 +
 .../servicestests/assets/NetworkPolicy/OWNERS |  1 +
 .../NetworkPolicyManagerServiceTest/OWNERS    |  1 +
 .../src/com/android/server/OWNERS             |  6 ++++++
 .../com/android/server/accessibility/OWNERS   |  1 +
 .../src/com/android/server/accounts/OWNERS    |  1 +
 .../src/com/android/server/adb/OWNERS         |  1 +
 .../src/com/android/server/am/OWNERS          |  1 +
 .../src/com/android/server/appop/OWNERS       |  1 +
 .../src/com/android/server/appsearch/OWNERS   |  1 +
 .../src/com/android/server/attention/OWNERS   |  1 +
 .../src/com/android/server/backup/OWNERS      |  1 +
 .../src/com/android/server/compat/OWNERS      |  1 +
 .../com/android/server/devicepolicy/OWNERS    |  1 +
 .../src/com/android/server/devicestate/OWNERS |  1 +
 .../src/com/android/server/display/OWNERS     |  1 +
 .../src/com/android/server/hdmi/OWNERS        |  1 +
 .../src/com/android/server/input/OWNERS       |  1 +
 .../src/com/android/server/inputmethod/OWNERS |  1 +
 .../src/com/android/server/integrity/OWNERS   |  1 +
 .../src/com/android/server/job/OWNERS         |  1 +
 .../src/com/android/server/lights/OWNERS      |  1 +
 .../com/android/server/locksettings/OWNERS    |  1 +
 .../src/com/android/server/net/OWNERS         |  1 +
 .../src/com/android/server/om/OWNERS          |  1 +
 .../src/com/android/server/people/OWNERS      |  1 +
 .../src/com/android/server/pm/OWNERS          |  1 +
 .../src/com/android/server/policy/OWNERS      |  1 +
 .../src/com/android/server/power/OWNERS       |  1 +
 .../src/com/android/server/powerstats/OWNERS  |  1 +
 .../src/com/android/server/rollback/OWNERS    |  1 +
 .../server/soundtrigger_middleware/OWNERS     |  1 +
 .../src/com/android/server/stats/OWNERS       |  1 +
 .../src/com/android/server/storage/OWNERS     |  1 +
 .../com/android/server/textclassifier/OWNERS  |  1 +
 .../com/android/server/timedetector/OWNERS    |  1 +
 .../src/com/android/server/timezone/OWNERS    |  1 +
 .../android/server/timezonedetector/OWNERS    |  1 +
 .../src/com/android/server/tv/OWNERS          |  1 +
 .../src/com/android/server/uri/OWNERS         |  1 +
 .../src/com/android/server/usage/OWNERS       |  1 +
 .../src/com/android/server/vibrator/OWNERS    |  1 +
 .../src/com/android/server/wallpaper/OWNERS   |  1 +
 .../servicestests/test-apps/JobTestApp/OWNERS |  1 +
 .../test-apps/PackageParserApp/OWNERS         |  1 +
 .../PackageParsingTestManifests/OWNERS        |  1 +
 .../src/com/android/server/OWNERS             |  1 +
 .../com/android/server/notification/OWNERS    |  1 +
 .../src/com/android/server/slice/OWNERS       |  1 +
 services/tests/wmtests/OWNERS                 |  1 +
 services/voiceinteraction/OWNERS              |  1 +
 services/wifi/OWNERS                          |  1 +
 tests/ActivityManagerPerfTests/OWNERS         |  1 +
 tests/AmSlam/OWNERS                           |  1 +
 tests/BlobStoreTestUtils/OWNERS               |  1 +
 tests/Camera2Tests/OWNERS                     |  1 +
 tests/CanvasCompare/OWNERS                    |  1 +
 tests/Compatibility/OWNERS                    |  1 +
 tests/DozeTest/OWNERS                         |  1 +
 tests/FixVibrateSetting/OWNERS                |  1 +
 tests/FlickerTests/OWNERS                     |  1 +
 tests/HugeBackup/OWNERS                       |  1 +
 tests/HwAccelerationTest/OWNERS               |  1 +
 tests/Input/OWNERS                            |  1 +
 tests/JobSchedulerPerfTests/OWNERS            |  1 +
 tests/JobSchedulerTestApp/OWNERS              |  1 +
 tests/LocationTracker/OWNERS                  |  1 +
 tests/LowStorageTest/OWNERS                   |  1 +
 tests/NetworkSecurityConfigTest/OWNERS        |  1 +
 tests/PackageWatchdog/OWNERS                  |  1 +
 .../src/com/android/server/OWNERS             |  1 +
 tests/PlatformCompatGating/OWNERS             |  1 +
 tests/RollbackTest/OWNERS                     |  1 +
 tests/SoundTriggerTestApp/OWNERS              |  1 +
 tests/SoundTriggerTests/OWNERS                |  1 +
 tests/StagedInstallTest/OWNERS                |  1 +
 tests/StatusBar/OWNERS                        |  1 +
 tests/TaskOrganizerTest/OWNERS                |  1 +
 tests/TelephonyCommonTests/OWNERS             |  1 +
 tests/UsageReportingTest/OWNERS               |  1 +
 tests/UsageStatsPerfTests/OWNERS              |  1 +
 tests/UsageStatsTest/OWNERS                   |  1 +
 tests/UsbHostExternalManagmentTest/OWNERS     |  1 +
 tests/UsbManagerTests/OWNERS                  |  1 +
 tests/UsbTests/OWNERS                         |  1 +
 tests/VoiceInteraction/OWNERS                 |  1 +
 tests/WindowAnimationJank/OWNERS              |  1 +
 tests/WindowInsetsTests/OWNERS                |  1 +
 tests/backup/OWNERS                           |  1 +
 .../src/com/android/server/net/OWNERS         |  1 +
 tests/notification/OWNERS                     |  1 +
 tests/permission/OWNERS                       |  1 +
 tests/utils/DummyIME/OWNERS                   |  1 +
 tests/utils/StubIME/OWNERS                    |  1 +
 .../src/com/android/tests/rollback/OWNERS     |  1 +
 .../com/android/server/accessibility/OWNERS   |  1 +
 .../java/com/android/server/wm/OWNERS         |  1 +
 tools/aapt/OWNERS                             |  1 +
 tools/fonts/OWNERS                            |  1 +
 tools/incident_report/OWNERS                  |  1 +
 tools/incident_section_gen/OWNERS             |  1 +
 tools/powerstats/OWNERS                       |  1 +
 256 files changed, 332 insertions(+), 10 deletions(-)
 create mode 100644 apct-tests/perftests/autofill/OWNERS
 create mode 100644 apct-tests/perftests/blobstore/OWNERS
 create mode 100644 apct-tests/perftests/contentcapture/OWNERS
 create mode 100644 apct-tests/perftests/core/apps/overlay/OWNERS
 create mode 100644 apct-tests/perftests/core/src/android/accounts/OWNERS
 create mode 100644 apct-tests/perftests/core/src/android/database/OWNERS
 create mode 100644 apct-tests/perftests/inputmethod/OWNERS
 create mode 100644 apct-tests/perftests/packagemanager/OWNERS
 create mode 100644 apct-tests/perftests/textclassifier/OWNERS
 create mode 100644 apct-tests/perftests/windowmanager/OWNERS
 create mode 100644 api/OWNERS
 create mode 100644 cmds/am/OWNERS
 create mode 100644 cmds/appops/OWNERS
 create mode 100644 cmds/backup/OWNERS
 create mode 100644 cmds/bmgr/OWNERS
 create mode 100644 cmds/bu/OWNERS
 create mode 100644 cmds/dpm/OWNERS
 create mode 100644 cmds/ime/OWNERS
 create mode 100644 cmds/incident/OWNERS
 create mode 100644 cmds/input/OWNERS
 create mode 100644 cmds/locksettings/OWNERS
 create mode 100644 cmds/pm/OWNERS
 create mode 100644 cmds/sm/OWNERS
 create mode 100644 cmds/telecom/OWNERS
 create mode 100644 cmds/uinput/OWNERS
 create mode 100644 cmds/wm/OWNERS
 create mode 100644 core/java/android/app/OWNERS
 create mode 100644 core/java/android/app/servertransaction/OWNERS
 create mode 100644 core/java/android/hardware/hdmi/OWNERS
 create mode 100644 core/java/android/hardware/lights/OWNERS
 create mode 100644 core/java/android/hardware/soundtrigger/OWNERS
 create mode 100644 core/java/android/timezone/OWNERS
 create mode 100644 core/java/com/android/ims/OWNERS
 create mode 100644 core/java/com/android/internal/config/sysui/OWNERS
 create mode 100644 core/java/com/android/internal/policy/OWNERS
 create mode 100644 core/java/com/android/internal/statusbar/OWNERS
 create mode 100644 core/tests/ConnectivityManagerTest/OWNERS
 create mode 100644 core/tests/PackageInstallerSessions/OWNERS
 create mode 100644 core/tests/benchmarks/src/android/net/OWNERS
 create mode 100644 core/tests/bluetoothtests/OWNERS
 create mode 100644 core/tests/coretests/apks/OWNERS
 create mode 100644 core/tests/coretests/src/android/accessibilityservice/OWNERS
 create mode 100644 core/tests/coretests/src/android/database/OWNERS
 create mode 100644 core/tests/coretests/src/android/net/OWNERS
 create mode 100644 core/tests/coretests/src/com/android/internal/accessibility/OWNERS
 create mode 100644 core/tests/coretests/src/com/android/internal/inputmethod/OWNERS
 create mode 100644 core/tests/coretests/src/com/android/internal/policy/OWNERS
 create mode 100644 core/tests/coretests/src/com/android/internal/power/OWNERS
 create mode 100644 core/tests/coretests/src/com/android/internal/statusbar/OWNERS
 create mode 100644 core/tests/devicestatetests/src/android/hardware/devicestate/OWNERS
 create mode 100644 core/tests/hdmitests/OWNERS
 create mode 100644 core/tests/hosttests/test-apps/OWNERS
 create mode 100644 core/tests/notificationtests/OWNERS
 create mode 100644 core/tests/overlaytests/OWNERS
 create mode 100644 core/tests/packagemanagertests/OWNERS
 create mode 100644 core/tests/powertests/OWNERS
 create mode 100644 data/fonts/OWNERS
 create mode 100644 graphics/OWNERS
 create mode 100644 libs/incident/OWNERS
 create mode 100644 libs/input/OWNERS
 create mode 100644 libs/storage/OWNERS
 create mode 100644 libs/usb/OWNERS
 create mode 100644 location/OWNERS
 create mode 100644 mime/OWNERS
 create mode 100644 native/android/aidl/com/android/internal/compat/OWNERS
 create mode 100644 native/graphics/OWNERS
 create mode 100644 packages/AppPredictionLib/OWNERS
 create mode 100644 packages/Backup/OWNERS
 create mode 100644 packages/BackupEncryption/OWNERS
 create mode 100644 packages/BackupRestoreConfirmation/OWNERS
 create mode 100644 packages/EasterEgg/OWNERS
 create mode 100644 packages/ExternalStorageProvider/OWNERS
 create mode 100644 packages/FusedLocation/OWNERS
 create mode 100644 packages/MtpDocumentsProvider/OWNERS
 create mode 100644 packages/PrintRecommendationService/OWNERS
 create mode 100644 packages/PrintSpooler/OWNERS
 create mode 100644 packages/SharedStorageBackup/OWNERS
 create mode 100644 packages/Tethering/OWNERS
 create mode 100644 packages/VpnDialogs/OWNERS
 create mode 100644 packages/WAPPushManager/OWNERS
 create mode 100644 packages/WallpaperBackup/OWNERS
 create mode 100644 packages/WallpaperCropper/OWNERS
 create mode 100644 packages/WindowManager/OWNERS
 create mode 100644 packages/overlays/OWNERS
 create mode 100644 packages/services/PacProcessor/OWNERS
 create mode 100644 packages/services/Proxy/OWNERS
 create mode 100644 proto/src/OWNERS
 create mode 100644 samples/training/network-usage/OWNERS
 create mode 100644 services/OWNERS
 create mode 100644 services/appprediction/OWNERS
 create mode 100644 services/autofill/OWNERS
 create mode 100644 services/contentcapture/OWNERS
 create mode 100644 services/contentsuggestions/OWNERS
 create mode 100644 services/core/OWNERS
 create mode 100644 services/core/java/com/android/server/adb/OWNERS
 create mode 100644 services/core/java/com/android/server/appop/OWNERS
 create mode 100644 services/core/java/com/android/server/attention/OWNERS
 create mode 100644 services/core/java/com/android/server/backup/OWNERS
 create mode 100644 services/core/java/com/android/server/camera/OWNERS
 create mode 100644 services/core/java/com/android/server/contentcapture/OWNERS
 create mode 100644 services/core/java/com/android/server/hdmi/OWNERS
 create mode 100644 services/core/java/com/android/server/incident/OWNERS
 create mode 100644 services/core/java/com/android/server/om/OWNERS
 create mode 100644 services/core/java/com/android/server/people/OWNERS
 create mode 100644 services/core/java/com/android/server/policy/OWNERS
 create mode 100644 services/core/java/com/android/server/powerstats/OWNERS
 create mode 100644 services/core/java/com/android/server/slice/OWNERS
 create mode 100644 services/core/java/com/android/server/statusbar/OWNERS
 create mode 100644 services/core/java/com/android/server/storage/OWNERS
 create mode 100644 services/core/java/com/android/server/textclassifier/OWNERS
 create mode 100644 services/core/java/com/android/server/timedetector/OWNERS
 create mode 100644 services/core/java/com/android/server/timezone/OWNERS
 create mode 100644 services/core/java/com/android/server/timezonedetector/OWNERS
 create mode 100644 services/core/java/com/android/server/trust/OWNERS
 create mode 100644 services/core/java/com/android/server/tv/OWNERS
 create mode 100644 services/core/java/com/android/server/wallpaper/OWNERS
 create mode 100644 services/core/jni/gnss/OWNERS
 create mode 100644 services/core/xsd/platform-compat-schema/OWNERS
 create mode 100644 services/devicepolicy/OWNERS
 create mode 100644 services/incremental/OWNERS
 create mode 100644 services/print/OWNERS
 create mode 100644 services/restrictions/OWNERS
 create mode 100644 services/robotests/backup/OWNERS
 create mode 100644 services/robotests/src/com/android/server/backup/OWNERS
 create mode 100644 services/robotests/src/com/android/server/pm/OWNERS
 create mode 100644 services/startop/OWNERS
 create mode 100644 services/tests/PackageManager/OWNERS
 create mode 100644 services/tests/PackageManagerComponentOverrideTests/OWNERS
 create mode 100644 services/tests/mockingservicestests/assets/AppOpsUpgradeTest/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/alarm/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/am/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/appop/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/blob/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/display/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/job/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/power/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/usage/OWNERS
 create mode 100644 services/tests/mockingservicestests/src/com/android/server/wallpaper/OWNERS
 create mode 100644 services/tests/servicestests/apks/OWNERS
 create mode 100644 services/tests/servicestests/assets/NetworkPolicy/OWNERS
 create mode 100644 services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/accessibility/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/accounts/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/adb/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/am/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/appop/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/appsearch/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/attention/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/backup/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/compat/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/devicepolicy/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/devicestate/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/display/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/hdmi/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/input/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/inputmethod/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/integrity/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/job/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/lights/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/locksettings/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/net/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/om/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/people/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/pm/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/policy/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/power/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/powerstats/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/rollback/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/soundtrigger_middleware/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/stats/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/storage/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/textclassifier/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/timedetector/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/timezone/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/timezonedetector/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/tv/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/uri/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/usage/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/vibrator/OWNERS
 create mode 100644 services/tests/servicestests/src/com/android/server/wallpaper/OWNERS
 create mode 100644 services/tests/servicestests/test-apps/JobTestApp/OWNERS
 create mode 100644 services/tests/servicestests/test-apps/PackageParserApp/OWNERS
 create mode 100644 services/tests/servicestests/test-apps/PackageParsingTestManifests/OWNERS
 create mode 100644 services/tests/uiservicestests/src/com/android/server/OWNERS
 create mode 100644 services/tests/uiservicestests/src/com/android/server/notification/OWNERS
 create mode 100644 services/tests/uiservicestests/src/com/android/server/slice/OWNERS
 create mode 100644 services/tests/wmtests/OWNERS
 create mode 100644 services/voiceinteraction/OWNERS
 create mode 100644 services/wifi/OWNERS
 create mode 100644 tests/ActivityManagerPerfTests/OWNERS
 create mode 100644 tests/AmSlam/OWNERS
 create mode 100644 tests/BlobStoreTestUtils/OWNERS
 create mode 100644 tests/Camera2Tests/OWNERS
 create mode 100644 tests/CanvasCompare/OWNERS
 create mode 100644 tests/Compatibility/OWNERS
 create mode 100644 tests/DozeTest/OWNERS
 create mode 100644 tests/FixVibrateSetting/OWNERS
 create mode 100644 tests/FlickerTests/OWNERS
 create mode 100644 tests/HugeBackup/OWNERS
 create mode 100644 tests/HwAccelerationTest/OWNERS
 create mode 100644 tests/Input/OWNERS
 create mode 100644 tests/JobSchedulerPerfTests/OWNERS
 create mode 100644 tests/JobSchedulerTestApp/OWNERS
 create mode 100644 tests/LocationTracker/OWNERS
 create mode 100644 tests/LowStorageTest/OWNERS
 create mode 100644 tests/NetworkSecurityConfigTest/OWNERS
 create mode 100644 tests/PackageWatchdog/OWNERS
 create mode 100644 tests/PackageWatchdog/src/com/android/server/OWNERS
 create mode 100644 tests/PlatformCompatGating/OWNERS
 create mode 100644 tests/RollbackTest/OWNERS
 create mode 100644 tests/SoundTriggerTestApp/OWNERS
 create mode 100644 tests/SoundTriggerTests/OWNERS
 create mode 100644 tests/StagedInstallTest/OWNERS
 create mode 100644 tests/StatusBar/OWNERS
 create mode 100644 tests/TaskOrganizerTest/OWNERS
 create mode 100644 tests/TelephonyCommonTests/OWNERS
 create mode 100644 tests/UsageReportingTest/OWNERS
 create mode 100644 tests/UsageStatsPerfTests/OWNERS
 create mode 100644 tests/UsageStatsTest/OWNERS
 create mode 100644 tests/UsbHostExternalManagmentTest/OWNERS
 create mode 100644 tests/UsbManagerTests/OWNERS
 create mode 100644 tests/UsbTests/OWNERS
 create mode 100644 tests/VoiceInteraction/OWNERS
 create mode 100644 tests/WindowAnimationJank/OWNERS
 create mode 100644 tests/WindowInsetsTests/OWNERS
 create mode 100644 tests/backup/OWNERS
 create mode 100644 tests/benchmarks/src/com/android/server/net/OWNERS
 create mode 100644 tests/notification/OWNERS
 create mode 100644 tests/permission/OWNERS
 create mode 100644 tests/utils/DummyIME/OWNERS
 create mode 100644 tests/utils/StubIME/OWNERS
 create mode 100644 tests/utils/hostutils/src/com/android/tests/rollback/OWNERS
 create mode 100644 tests/utils/testutils/java/com/android/server/accessibility/OWNERS
 create mode 100644 tests/utils/testutils/java/com/android/server/wm/OWNERS
 create mode 100644 tools/aapt/OWNERS
 create mode 100644 tools/fonts/OWNERS
 create mode 100644 tools/incident_report/OWNERS
 create mode 100644 tools/incident_section_gen/OWNERS
 create mode 100644 tools/powerstats/OWNERS

diff --git a/OWNERS b/OWNERS
index 9b0a8bdb3709..4f89f7dde6af 100644
--- a/OWNERS
+++ b/OWNERS
@@ -17,3 +17,8 @@ yamasani@google.com
 
 # Support bulk translation updates
 per-file */res*/values*/*.xml = byi@google.com
+
+per-file Android.bp = file:platform/build/soong:/OWNERS
+per-file Android.mk = file:platform/build/soong:/OWNERS
+per-file ApiDocs.bp = file:platform/build/soong:/OWNERS
+per-file StubLibraries.bp = file:platform/build/soong:/OWNERS
diff --git a/apct-tests/perftests/autofill/OWNERS b/apct-tests/perftests/autofill/OWNERS
new file mode 100644
index 000000000000..c52751d79227
--- /dev/null
+++ b/apct-tests/perftests/autofill/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/autofill/OWNERS
diff --git a/apct-tests/perftests/blobstore/OWNERS b/apct-tests/perftests/blobstore/OWNERS
new file mode 100644
index 000000000000..65bb6b8a5423
--- /dev/null
+++ b/apct-tests/perftests/blobstore/OWNERS
@@ -0,0 +1 @@
+include /apex/blobstore/OWNERS
diff --git a/apct-tests/perftests/contentcapture/OWNERS b/apct-tests/perftests/contentcapture/OWNERS
new file mode 100644
index 000000000000..a28e00a5c490
--- /dev/null
+++ b/apct-tests/perftests/contentcapture/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/contentcapture/OWNERS
diff --git a/apct-tests/perftests/core/apps/overlay/OWNERS b/apct-tests/perftests/core/apps/overlay/OWNERS
new file mode 100644
index 000000000000..afb98d416762
--- /dev/null
+++ b/apct-tests/perftests/core/apps/overlay/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/content/om/OWNERS
diff --git a/apct-tests/perftests/core/src/android/accounts/OWNERS b/apct-tests/perftests/core/src/android/accounts/OWNERS
new file mode 100644
index 000000000000..df1b4f432cd6
--- /dev/null
+++ b/apct-tests/perftests/core/src/android/accounts/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/accounts/OWNERS
diff --git a/apct-tests/perftests/core/src/android/database/OWNERS b/apct-tests/perftests/core/src/android/database/OWNERS
new file mode 100644
index 000000000000..bb9a2ca27ba9
--- /dev/null
+++ b/apct-tests/perftests/core/src/android/database/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/database/OWNERS
diff --git a/apct-tests/perftests/inputmethod/OWNERS b/apct-tests/perftests/inputmethod/OWNERS
new file mode 100644
index 000000000000..5deb2ce8f24b
--- /dev/null
+++ b/apct-tests/perftests/inputmethod/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/inputmethod/OWNERS
diff --git a/apct-tests/perftests/packagemanager/OWNERS b/apct-tests/perftests/packagemanager/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/apct-tests/perftests/packagemanager/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/apct-tests/perftests/textclassifier/OWNERS b/apct-tests/perftests/textclassifier/OWNERS
new file mode 100644
index 000000000000..46b3cb8824a0
--- /dev/null
+++ b/apct-tests/perftests/textclassifier/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/textclassifier/OWNERS
diff --git a/apct-tests/perftests/windowmanager/OWNERS b/apct-tests/perftests/windowmanager/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/apct-tests/perftests/windowmanager/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/api/OWNERS b/api/OWNERS
new file mode 100644
index 000000000000..88d0b61a2ab6
--- /dev/null
+++ b/api/OWNERS
@@ -0,0 +1 @@
+per-file Android.bp = file:platform/build/soong:/OWNERS
diff --git a/cmds/am/OWNERS b/cmds/am/OWNERS
new file mode 100644
index 000000000000..72c0a9e6e90c
--- /dev/null
+++ b/cmds/am/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/am/OWNERS
diff --git a/cmds/appops/OWNERS b/cmds/appops/OWNERS
new file mode 100644
index 000000000000..999ea0e62a0a
--- /dev/null
+++ b/cmds/appops/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/permission/OWNERS
diff --git a/cmds/backup/OWNERS b/cmds/backup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/cmds/backup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/cmds/bmgr/OWNERS b/cmds/bmgr/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/cmds/bmgr/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/cmds/bu/OWNERS b/cmds/bu/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/cmds/bu/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/cmds/dpm/OWNERS b/cmds/dpm/OWNERS
new file mode 100644
index 000000000000..e95633abe79a
--- /dev/null
+++ b/cmds/dpm/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/admin/OWNERS
diff --git a/cmds/ime/OWNERS b/cmds/ime/OWNERS
new file mode 100644
index 000000000000..5deb2ce8f24b
--- /dev/null
+++ b/cmds/ime/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/inputmethod/OWNERS
diff --git a/cmds/incident/OWNERS b/cmds/incident/OWNERS
new file mode 100644
index 000000000000..f76611555dbb
--- /dev/null
+++ b/cmds/incident/OWNERS
@@ -0,0 +1 @@
+include /cmds/incidentd/OWNERS
diff --git a/cmds/input/OWNERS b/cmds/input/OWNERS
new file mode 100644
index 000000000000..d701f23cb9b8
--- /dev/null
+++ b/cmds/input/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/hardware/input/OWNERS
diff --git a/cmds/locksettings/OWNERS b/cmds/locksettings/OWNERS
new file mode 100644
index 000000000000..0a8dc8c45a9f
--- /dev/null
+++ b/cmds/locksettings/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/locksettings/OWNERS
diff --git a/cmds/pm/OWNERS b/cmds/pm/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/cmds/pm/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/cmds/sm/OWNERS b/cmds/sm/OWNERS
new file mode 100644
index 000000000000..6f9dbea36b06
--- /dev/null
+++ b/cmds/sm/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/os/storage/OWNERS
diff --git a/cmds/telecom/OWNERS b/cmds/telecom/OWNERS
new file mode 100644
index 000000000000..2f813e6aeb7f
--- /dev/null
+++ b/cmds/telecom/OWNERS
@@ -0,0 +1 @@
+include /telecomm/OWNERS
diff --git a/cmds/uinput/OWNERS b/cmds/uinput/OWNERS
new file mode 100644
index 000000000000..d701f23cb9b8
--- /dev/null
+++ b/cmds/uinput/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/hardware/input/OWNERS
diff --git a/cmds/wm/OWNERS b/cmds/wm/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/cmds/wm/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/config/OWNERS b/config/OWNERS
index 3d4924df3462..d59c6f2d72ba 100644
--- a/config/OWNERS
+++ b/config/OWNERS
@@ -1,4 +1,7 @@
+include /ZYGOTE_OWNERS
+
 # compat-team@ for changes to hiddenapi files
+
 per-file hiddenapi-* = andreionea@google.com, mathewi@google.com, satayev@google.com
 
 # Escalations:
diff --git a/core/java/android/app/OWNERS b/core/java/android/app/OWNERS
new file mode 100644
index 000000000000..633d093435ee
--- /dev/null
+++ b/core/java/android/app/OWNERS
@@ -0,0 +1 @@
+per-file *Zygote* = file:/ZYGOTE_OWNERS
diff --git a/core/java/android/app/servertransaction/OWNERS b/core/java/android/app/servertransaction/OWNERS
new file mode 100644
index 000000000000..aa6248e7d826
--- /dev/null
+++ b/core/java/android/app/servertransaction/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 316125
+
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/core/java/android/hardware/display/OWNERS b/core/java/android/hardware/display/OWNERS
index 9ca391013aa3..5bcd9bb87c7a 100644
--- a/core/java/android/hardware/display/OWNERS
+++ b/core/java/android/hardware/display/OWNERS
@@ -1,2 +1,6 @@
+# Bug component: 345010
+
+include /services/core/java/com/android/server/display/OWNERS
+
 michaelwr@google.com
 santoscordon@google.com
diff --git a/core/java/android/hardware/hdmi/OWNERS b/core/java/android/hardware/hdmi/OWNERS
new file mode 100644
index 000000000000..e9557f84f8fb
--- /dev/null
+++ b/core/java/android/hardware/hdmi/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 345010
+
+include /services/core/java/com/android/server/display/OWNERS
diff --git a/core/java/android/hardware/input/OWNERS b/core/java/android/hardware/input/OWNERS
index 0313a40f7270..25e02e1aa6f3 100644
--- a/core/java/android/hardware/input/OWNERS
+++ b/core/java/android/hardware/input/OWNERS
@@ -1,2 +1,6 @@
+# Bug component: 136048
+
+include /services/core/java/com/android/server/input/OWNERS
+
 michaelwr@google.com
 svv@google.com
diff --git a/core/java/android/hardware/lights/OWNERS b/core/java/android/hardware/lights/OWNERS
new file mode 100644
index 000000000000..cb46a80d9b60
--- /dev/null
+++ b/core/java/android/hardware/lights/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/lights/OWNERS
diff --git a/core/java/android/hardware/soundtrigger/OWNERS b/core/java/android/hardware/soundtrigger/OWNERS
new file mode 100644
index 000000000000..816bc6bba639
--- /dev/null
+++ b/core/java/android/hardware/soundtrigger/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/media/soundtrigger/OWNERS
diff --git a/core/java/android/inputmethodservice/OWNERS b/core/java/android/inputmethodservice/OWNERS
index 444719701df2..e6a04dad25c2 100644
--- a/core/java/android/inputmethodservice/OWNERS
+++ b/core/java/android/inputmethodservice/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 34867
 set noparent
 
-include ../../../../services/core/java/com/android/server/inputmethod/OWNERS
+include /services/core/java/com/android/server/inputmethod/OWNERS
diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS
index 40c291f14b67..6b5e2d88cb5e 100644
--- a/core/java/android/os/OWNERS
+++ b/core/java/android/os/OWNERS
@@ -15,7 +15,7 @@ per-file IPowerManager.aidl = michaelwr@google.com, santoscordon@google.com
 per-file PowerManager.java = michaelwr@google.com, santoscordon@google.com
 per-file PowerManagerInternal.java = michaelwr@google.com, santoscordon@google.com
 
-# Zygote
-per-file ZygoteProcess.java = calin@google.com, chriswailes@google.com, maco@google.com, narayan@google.com, ngeoffray@google.com
 
 per-file GraphicsEnvironment.java = chrisforbes@google.com, cnorthrop@google.com, lpy@google.com, timvp@google.com, zzyiwei@google.com
+
+per-file *Zygote* = file:/ZYGOTE_OWNERS
diff --git a/core/java/android/provider/OWNERS b/core/java/android/provider/OWNERS
index 97e015646df0..792ff20f6d28 100644
--- a/core/java/android/provider/OWNERS
+++ b/core/java/android/provider/OWNERS
@@ -2,4 +2,8 @@ per-file DeviceConfig.java = svetoslavganov@google.com
 per-file DeviceConfig.java = hackbod@google.com
 per-file DeviceConfig.java = schfan@google.com
 
-
+per-file CallLog.java = file:/telephony/OWNERS
+per-file DocumentsContract.java = file:/core/java/android/os/storage/OWNERS
+per-file DocumentsProvider.java = file:/core/java/android/os/storage/OWNERS
+per-file MediaStore.java = file:/core/java/android/os/storage/OWNERS
+per-file Telephony.java = file:/telephony/OWNERS
diff --git a/core/java/android/timezone/OWNERS b/core/java/android/timezone/OWNERS
new file mode 100644
index 000000000000..09447a971bdd
--- /dev/null
+++ b/core/java/android/timezone/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/timezone/OWNERS
diff --git a/core/java/android/view/inputmethod/OWNERS b/core/java/android/view/inputmethod/OWNERS
index 244cc30e089e..e6a04dad25c2 100644
--- a/core/java/android/view/inputmethod/OWNERS
+++ b/core/java/android/view/inputmethod/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 34867
 set noparent
 
-include ../../../../../services/core/java/com/android/server/inputmethod/OWNERS
+include /services/core/java/com/android/server/inputmethod/OWNERS
diff --git a/core/java/android/window/OWNERS b/core/java/android/window/OWNERS
index d10fb31e104f..2c61df96eb03 100644
--- a/core/java/android/window/OWNERS
+++ b/core/java/android/window/OWNERS
@@ -1,3 +1,3 @@
 set noparent
 
-include ../../../../services/core/java/com/android/server/wm/OWNERS
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/core/java/com/android/ims/OWNERS b/core/java/com/android/ims/OWNERS
new file mode 100644
index 000000000000..640baf2297b4
--- /dev/null
+++ b/core/java/com/android/ims/OWNERS
@@ -0,0 +1 @@
+include /telephony/OWNERS
diff --git a/core/java/com/android/internal/config/sysui/OWNERS b/core/java/com/android/internal/config/sysui/OWNERS
new file mode 100644
index 000000000000..2e96c97c8bb3
--- /dev/null
+++ b/core/java/com/android/internal/config/sysui/OWNERS
@@ -0,0 +1 @@
+include /packages/SystemUI/OWNERS
diff --git a/core/java/com/android/internal/os/OWNERS b/core/java/com/android/internal/os/OWNERS
index afc94329dc4d..633d093435ee 100644
--- a/core/java/com/android/internal/os/OWNERS
+++ b/core/java/com/android/internal/os/OWNERS
@@ -1 +1 @@
-per-file ZygoteArguments.java,ZygoteConnection.java,ZygoteInit.java,Zygote.java,ZygoteServer.java = calin@google.com, chriswailes@google.com, maco@google.com, narayan@google.com, ngeoffray@google.com
+per-file *Zygote* = file:/ZYGOTE_OWNERS
diff --git a/core/java/com/android/internal/policy/OWNERS b/core/java/com/android/internal/policy/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/core/java/com/android/internal/policy/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/core/java/com/android/internal/statusbar/OWNERS b/core/java/com/android/internal/statusbar/OWNERS
new file mode 100644
index 000000000000..2e96c97c8bb3
--- /dev/null
+++ b/core/java/com/android/internal/statusbar/OWNERS
@@ -0,0 +1 @@
+include /packages/SystemUI/OWNERS
diff --git a/core/jni/OWNERS b/core/jni/OWNERS
index 7d80993afc6e..bcd1278d87e7 100644
--- a/core/jni/OWNERS
+++ b/core/jni/OWNERS
@@ -16,5 +16,21 @@ per-file android_view_*KeyEvent.* = michaelwr@google.com, svv@google.com
 per-file android_view_*MotionEvent.* = michaelwr@google.com, svv@google.com
 per-file android_view_PointerIcon.* = michaelwr@google.com, svv@google.com
 
-# Zygote
-per-file com_android_internal_os_Zygote.*,fd_utils.* = calin@google.com, chriswailes@google.com, maco@google.com, narayan@google.com, ngeoffray@google.com
+per-file *Zygote* = file:/ZYGOTE_OWNERS
+per-file Android.bp = file:platform/build/soong:/OWNERS
+per-file android_animation_* = file:/core/java/android/animation/OWNERS
+per-file android_app_admin_* = file:/core/java/android/app/admin/OWNERS
+per-file android_content_res_* = file:/core/java/android/content/res/OWNERS
+per-file android_graphics_* = file:/graphics/java/android/graphics/OWNERS
+per-file android_hardware_Usb* = file:/services/usb/OWNERS
+per-file android_hardware_display_* = file:/core/java/android/hardware/display/OWNERS
+per-file android_hardware_input_* = file:/core/java/android/hardware/input/OWNERS
+per-file android_hardware_location_* = file:/core/java/android/hardware/location/OWNERS
+per-file android_media_* = file:/media/java/android/media/OWNERS
+per-file android_media_midi_* = file:/media/java/android/media/midi/OWNERS
+per-file android_opengl_* = file:/opengl/java/android/opengl/OWNERS
+per-file android_os_storage_* = file:/core/java/android/os/storage/OWNERS
+per-file android_se_* = file:/core/java/android/se/OWNERS
+per-file android_security_* = file:/core/java/android/security/OWNERS
+per-file android_view_* = file:/core/java/android/view/OWNERS
+per-file com_android_internal_net_* = file:/services/core/java/com/android/server/net/OWNERS
diff --git a/core/tests/ConnectivityManagerTest/OWNERS b/core/tests/ConnectivityManagerTest/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/core/tests/ConnectivityManagerTest/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/core/tests/PackageInstallerSessions/OWNERS b/core/tests/PackageInstallerSessions/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/core/tests/PackageInstallerSessions/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/core/tests/benchmarks/src/android/net/OWNERS b/core/tests/benchmarks/src/android/net/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/core/tests/benchmarks/src/android/net/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/core/tests/bluetoothtests/OWNERS b/core/tests/bluetoothtests/OWNERS
new file mode 100644
index 000000000000..98bb87716207
--- /dev/null
+++ b/core/tests/bluetoothtests/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/bluetooth/OWNERS
diff --git a/core/tests/coretests/apks/OWNERS b/core/tests/coretests/apks/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/core/tests/coretests/apks/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/core/tests/coretests/src/android/accessibilityservice/OWNERS b/core/tests/coretests/src/android/accessibilityservice/OWNERS
new file mode 100644
index 000000000000..b74281edbf52
--- /dev/null
+++ b/core/tests/coretests/src/android/accessibilityservice/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/accessibility/OWNERS
diff --git a/core/tests/coretests/src/android/database/OWNERS b/core/tests/coretests/src/android/database/OWNERS
new file mode 100644
index 000000000000..bb9a2ca27ba9
--- /dev/null
+++ b/core/tests/coretests/src/android/database/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/database/OWNERS
diff --git a/core/tests/coretests/src/android/net/OWNERS b/core/tests/coretests/src/android/net/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/core/tests/coretests/src/android/net/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/core/tests/coretests/src/com/android/internal/accessibility/OWNERS b/core/tests/coretests/src/com/android/internal/accessibility/OWNERS
new file mode 100644
index 000000000000..b74281edbf52
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/accessibility/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/accessibility/OWNERS
diff --git a/core/tests/coretests/src/com/android/internal/inputmethod/OWNERS b/core/tests/coretests/src/com/android/internal/inputmethod/OWNERS
new file mode 100644
index 000000000000..5deb2ce8f24b
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/inputmethod/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/inputmethod/OWNERS
diff --git a/core/tests/coretests/src/com/android/internal/policy/OWNERS b/core/tests/coretests/src/com/android/internal/policy/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/policy/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/core/tests/coretests/src/com/android/internal/power/OWNERS b/core/tests/coretests/src/com/android/internal/power/OWNERS
new file mode 100644
index 000000000000..d68066bb8c40
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/power/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/power/OWNERS
diff --git a/core/tests/coretests/src/com/android/internal/statusbar/OWNERS b/core/tests/coretests/src/com/android/internal/statusbar/OWNERS
new file mode 100644
index 000000000000..2e96c97c8bb3
--- /dev/null
+++ b/core/tests/coretests/src/com/android/internal/statusbar/OWNERS
@@ -0,0 +1 @@
+include /packages/SystemUI/OWNERS
diff --git a/core/tests/devicestatetests/src/android/hardware/devicestate/OWNERS b/core/tests/devicestatetests/src/android/hardware/devicestate/OWNERS
new file mode 100644
index 000000000000..d9b0e2e5ffa5
--- /dev/null
+++ b/core/tests/devicestatetests/src/android/hardware/devicestate/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/devicestate/OWNERS
diff --git a/core/tests/hdmitests/OWNERS b/core/tests/hdmitests/OWNERS
new file mode 100644
index 000000000000..c3c47eda59d7
--- /dev/null
+++ b/core/tests/hdmitests/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/hardware/hdmi/OWNERS
diff --git a/core/tests/hosttests/test-apps/OWNERS b/core/tests/hosttests/test-apps/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/core/tests/hosttests/test-apps/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/core/tests/notificationtests/OWNERS b/core/tests/notificationtests/OWNERS
new file mode 100644
index 000000000000..396fd1213aca
--- /dev/null
+++ b/core/tests/notificationtests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/notification/OWNERS
diff --git a/core/tests/overlaytests/OWNERS b/core/tests/overlaytests/OWNERS
new file mode 100644
index 000000000000..afb98d416762
--- /dev/null
+++ b/core/tests/overlaytests/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/content/om/OWNERS
diff --git a/core/tests/packagemanagertests/OWNERS b/core/tests/packagemanagertests/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/core/tests/packagemanagertests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/core/tests/powertests/OWNERS b/core/tests/powertests/OWNERS
new file mode 100644
index 000000000000..d68066bb8c40
--- /dev/null
+++ b/core/tests/powertests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/power/OWNERS
diff --git a/data/fonts/OWNERS b/data/fonts/OWNERS
new file mode 100644
index 000000000000..a538331dd3f4
--- /dev/null
+++ b/data/fonts/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/graphics/fonts/OWNERS
diff --git a/graphics/OWNERS b/graphics/OWNERS
new file mode 100644
index 000000000000..a6d1bc37d27d
--- /dev/null
+++ b/graphics/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/graphics/OWNERS
diff --git a/libs/WindowManager/OWNERS b/libs/WindowManager/OWNERS
index 063d4594f2fa..2c61df96eb03 100644
--- a/libs/WindowManager/OWNERS
+++ b/libs/WindowManager/OWNERS
@@ -1,3 +1,3 @@
 set noparent
 
-include ../../services/core/java/com/android/server/wm/OWNERS
\ No newline at end of file
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/libs/incident/OWNERS b/libs/incident/OWNERS
new file mode 100644
index 000000000000..f76611555dbb
--- /dev/null
+++ b/libs/incident/OWNERS
@@ -0,0 +1 @@
+include /cmds/incidentd/OWNERS
diff --git a/libs/input/OWNERS b/libs/input/OWNERS
new file mode 100644
index 000000000000..d701f23cb9b8
--- /dev/null
+++ b/libs/input/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/hardware/input/OWNERS
diff --git a/libs/storage/OWNERS b/libs/storage/OWNERS
new file mode 100644
index 000000000000..6f9dbea36b06
--- /dev/null
+++ b/libs/storage/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/os/storage/OWNERS
diff --git a/libs/usb/OWNERS b/libs/usb/OWNERS
new file mode 100644
index 000000000000..f7b2a37a297a
--- /dev/null
+++ b/libs/usb/OWNERS
@@ -0,0 +1 @@
+include /services/usb/OWNERS
diff --git a/location/OWNERS b/location/OWNERS
new file mode 100644
index 000000000000..5ac6028411f0
--- /dev/null
+++ b/location/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/location/OWNERS
diff --git a/mime/OWNERS b/mime/OWNERS
new file mode 100644
index 000000000000..6f9dbea36b06
--- /dev/null
+++ b/mime/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/os/storage/OWNERS
diff --git a/native/android/aidl/com/android/internal/compat/OWNERS b/native/android/aidl/com/android/internal/compat/OWNERS
new file mode 100644
index 000000000000..f8c3520e9fa8
--- /dev/null
+++ b/native/android/aidl/com/android/internal/compat/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/compat/OWNERS
diff --git a/native/graphics/OWNERS b/native/graphics/OWNERS
new file mode 100644
index 000000000000..a6d1bc37d27d
--- /dev/null
+++ b/native/graphics/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/graphics/OWNERS
diff --git a/packages/AppPredictionLib/OWNERS b/packages/AppPredictionLib/OWNERS
new file mode 100644
index 000000000000..3a5d23d6928f
--- /dev/null
+++ b/packages/AppPredictionLib/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/appprediction/OWNERS
diff --git a/packages/Backup/OWNERS b/packages/Backup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/packages/Backup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/packages/BackupEncryption/OWNERS b/packages/BackupEncryption/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/packages/BackupEncryption/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/packages/BackupRestoreConfirmation/OWNERS b/packages/BackupRestoreConfirmation/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/packages/EasterEgg/OWNERS b/packages/EasterEgg/OWNERS
new file mode 100644
index 000000000000..2e96c97c8bb3
--- /dev/null
+++ b/packages/EasterEgg/OWNERS
@@ -0,0 +1 @@
+include /packages/SystemUI/OWNERS
diff --git a/packages/ExternalStorageProvider/OWNERS b/packages/ExternalStorageProvider/OWNERS
new file mode 100644
index 000000000000..6f9dbea36b06
--- /dev/null
+++ b/packages/ExternalStorageProvider/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/os/storage/OWNERS
diff --git a/packages/FusedLocation/OWNERS b/packages/FusedLocation/OWNERS
new file mode 100644
index 000000000000..5ac6028411f0
--- /dev/null
+++ b/packages/FusedLocation/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/location/OWNERS
diff --git a/packages/MtpDocumentsProvider/OWNERS b/packages/MtpDocumentsProvider/OWNERS
new file mode 100644
index 000000000000..6f9dbea36b06
--- /dev/null
+++ b/packages/MtpDocumentsProvider/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/os/storage/OWNERS
diff --git a/packages/PrintRecommendationService/OWNERS b/packages/PrintRecommendationService/OWNERS
new file mode 100644
index 000000000000..2c7b881faf0f
--- /dev/null
+++ b/packages/PrintRecommendationService/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/print/OWNERS
diff --git a/packages/PrintSpooler/OWNERS b/packages/PrintSpooler/OWNERS
new file mode 100644
index 000000000000..2c7b881faf0f
--- /dev/null
+++ b/packages/PrintSpooler/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/print/OWNERS
diff --git a/packages/SharedStorageBackup/OWNERS b/packages/SharedStorageBackup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/packages/SharedStorageBackup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/packages/Tethering/OWNERS b/packages/Tethering/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/packages/Tethering/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/packages/VpnDialogs/OWNERS b/packages/VpnDialogs/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/packages/VpnDialogs/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/packages/WAPPushManager/OWNERS b/packages/WAPPushManager/OWNERS
new file mode 100644
index 000000000000..640baf2297b4
--- /dev/null
+++ b/packages/WAPPushManager/OWNERS
@@ -0,0 +1 @@
+include /telephony/OWNERS
diff --git a/packages/WallpaperBackup/OWNERS b/packages/WallpaperBackup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/packages/WallpaperBackup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/packages/WallpaperCropper/OWNERS b/packages/WallpaperCropper/OWNERS
new file mode 100644
index 000000000000..8ff0f74202f8
--- /dev/null
+++ b/packages/WallpaperCropper/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/wallpaper/OWNERS
diff --git a/packages/WindowManager/OWNERS b/packages/WindowManager/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/packages/WindowManager/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/packages/overlays/OWNERS b/packages/overlays/OWNERS
new file mode 100644
index 000000000000..afb98d416762
--- /dev/null
+++ b/packages/overlays/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/content/om/OWNERS
diff --git a/packages/services/PacProcessor/OWNERS b/packages/services/PacProcessor/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/packages/services/PacProcessor/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/packages/services/Proxy/OWNERS b/packages/services/Proxy/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/packages/services/Proxy/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/proto/src/OWNERS b/proto/src/OWNERS
new file mode 100644
index 000000000000..e7ddf8691463
--- /dev/null
+++ b/proto/src/OWNERS
@@ -0,0 +1,2 @@
+per-file gnss.proto = file:/services/core/java/com/android/server/location/OWNERS
+per-file wifi.proto = file:/wifi/OWNERS
diff --git a/samples/training/network-usage/OWNERS b/samples/training/network-usage/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/samples/training/network-usage/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/services/OWNERS b/services/OWNERS
new file mode 100644
index 000000000000..88d0b61a2ab6
--- /dev/null
+++ b/services/OWNERS
@@ -0,0 +1 @@
+per-file Android.bp = file:platform/build/soong:/OWNERS
diff --git a/services/api/OWNERS b/services/api/OWNERS
index 0b95c5155594..a6093900c635 100644
--- a/services/api/OWNERS
+++ b/services/api/OWNERS
@@ -1,2 +1,4 @@
+per-file Android.bp = file:platform/build/soong:/OWNERS
+
 # API changes are managed via Prolog rules, not OWNERS
 *
diff --git a/services/appprediction/OWNERS b/services/appprediction/OWNERS
new file mode 100644
index 000000000000..3a5d23d6928f
--- /dev/null
+++ b/services/appprediction/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/appprediction/OWNERS
diff --git a/services/autofill/OWNERS b/services/autofill/OWNERS
new file mode 100644
index 000000000000..c52751d79227
--- /dev/null
+++ b/services/autofill/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/autofill/OWNERS
diff --git a/services/contentcapture/OWNERS b/services/contentcapture/OWNERS
new file mode 100644
index 000000000000..a28e00a5c490
--- /dev/null
+++ b/services/contentcapture/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/contentcapture/OWNERS
diff --git a/services/contentsuggestions/OWNERS b/services/contentsuggestions/OWNERS
new file mode 100644
index 000000000000..449db3a80b6d
--- /dev/null
+++ b/services/contentsuggestions/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/contentsuggestions/OWNERS
diff --git a/services/core/OWNERS b/services/core/OWNERS
new file mode 100644
index 000000000000..88d0b61a2ab6
--- /dev/null
+++ b/services/core/OWNERS
@@ -0,0 +1 @@
+per-file Android.bp = file:platform/build/soong:/OWNERS
diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS
index 3d1e709ab3bd..66c10d074629 100644
--- a/services/core/java/com/android/server/OWNERS
+++ b/services/core/java/com/android/server/OWNERS
@@ -10,3 +10,19 @@ per-file ZramWriteback.java = minchan@google.com, rajekumar@google.com, srnvs@go
 
 # Userspace reboot
 per-file UserspaceRebootLogger.java = ioffe@google.com, tomcherry@google.com
+
+per-file *Alarm* = file:/apex/jobscheduler/OWNERS
+per-file *AppOps* = file:/core/java/android/permission/OWNERS
+per-file *Bluetooth* = file:/core/java/android/bluetooth/OWNERS
+per-file *Gnss* = file:/services/core/java/com/android/server/location/OWNERS
+per-file *Location* = file:/services/core/java/com/android/server/location/OWNERS
+per-file *Network* = file:/services/core/java/com/android/server/net/OWNERS
+per-file *Storage* = file:/core/java/android/os/storage/OWNERS
+per-file *TimeUpdate* = file:/core/java/android/app/timezone/OWNERS
+per-file ConnectivityService.java = file:/services/core/java/com/android/server/net/OWNERS
+per-file IpSecService.java = file:/services/core/java/com/android/server/net/OWNERS
+per-file MmsServiceBroker.java = file:/telephony/OWNERS
+per-file NetIdManager.java = file:/services/core/java/com/android/server/net/OWNERS
+per-file PackageWatchdog.java = file:/services/core/java/com/android/server/rollback/OWNERS
+per-file TelephonyRegistry.java = file:/telephony/OWNERS
+per-file UiModeManagerService.java = file:/packages/SystemUI/OWNERS
diff --git a/services/core/java/com/android/server/adb/OWNERS b/services/core/java/com/android/server/adb/OWNERS
new file mode 100644
index 000000000000..b97f7956d115
--- /dev/null
+++ b/services/core/java/com/android/server/adb/OWNERS
@@ -0,0 +1 @@
+include platform/packages/modules/adb:/OWNERS
diff --git a/services/core/java/com/android/server/appop/OWNERS b/services/core/java/com/android/server/appop/OWNERS
new file mode 100644
index 000000000000..999ea0e62a0a
--- /dev/null
+++ b/services/core/java/com/android/server/appop/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/permission/OWNERS
diff --git a/services/core/java/com/android/server/attention/OWNERS b/services/core/java/com/android/server/attention/OWNERS
new file mode 100644
index 000000000000..51fc9bd09e4f
--- /dev/null
+++ b/services/core/java/com/android/server/attention/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/attention/OWNERS
diff --git a/services/core/java/com/android/server/backup/OWNERS b/services/core/java/com/android/server/backup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/services/core/java/com/android/server/backup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/services/core/java/com/android/server/camera/OWNERS b/services/core/java/com/android/server/camera/OWNERS
new file mode 100644
index 000000000000..f48a95c5b3a3
--- /dev/null
+++ b/services/core/java/com/android/server/camera/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
diff --git a/services/core/java/com/android/server/contentcapture/OWNERS b/services/core/java/com/android/server/contentcapture/OWNERS
new file mode 100644
index 000000000000..a28e00a5c490
--- /dev/null
+++ b/services/core/java/com/android/server/contentcapture/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/contentcapture/OWNERS
diff --git a/services/core/java/com/android/server/hdmi/OWNERS b/services/core/java/com/android/server/hdmi/OWNERS
new file mode 100644
index 000000000000..c3c47eda59d7
--- /dev/null
+++ b/services/core/java/com/android/server/hdmi/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/hardware/hdmi/OWNERS
diff --git a/services/core/java/com/android/server/incident/OWNERS b/services/core/java/com/android/server/incident/OWNERS
new file mode 100644
index 000000000000..f76611555dbb
--- /dev/null
+++ b/services/core/java/com/android/server/incident/OWNERS
@@ -0,0 +1 @@
+include /cmds/incidentd/OWNERS
diff --git a/services/core/java/com/android/server/om/OWNERS b/services/core/java/com/android/server/om/OWNERS
new file mode 100644
index 000000000000..afb98d416762
--- /dev/null
+++ b/services/core/java/com/android/server/om/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/content/om/OWNERS
diff --git a/services/core/java/com/android/server/people/OWNERS b/services/core/java/com/android/server/people/OWNERS
new file mode 100644
index 000000000000..3198a5e84307
--- /dev/null
+++ b/services/core/java/com/android/server/people/OWNERS
@@ -0,0 +1 @@
+include /services/people/OWNERS
diff --git a/services/core/java/com/android/server/policy/OWNERS b/services/core/java/com/android/server/policy/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/services/core/java/com/android/server/policy/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/services/core/java/com/android/server/powerstats/OWNERS b/services/core/java/com/android/server/powerstats/OWNERS
new file mode 100644
index 000000000000..d68066bb8c40
--- /dev/null
+++ b/services/core/java/com/android/server/powerstats/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/power/OWNERS
diff --git a/services/core/java/com/android/server/slice/OWNERS b/services/core/java/com/android/server/slice/OWNERS
new file mode 100644
index 000000000000..3d0859f6f701
--- /dev/null
+++ b/services/core/java/com/android/server/slice/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/slice/OWNERS
diff --git a/services/core/java/com/android/server/statusbar/OWNERS b/services/core/java/com/android/server/statusbar/OWNERS
new file mode 100644
index 000000000000..2e96c97c8bb3
--- /dev/null
+++ b/services/core/java/com/android/server/statusbar/OWNERS
@@ -0,0 +1 @@
+include /packages/SystemUI/OWNERS
diff --git a/services/core/java/com/android/server/storage/OWNERS b/services/core/java/com/android/server/storage/OWNERS
new file mode 100644
index 000000000000..6f9dbea36b06
--- /dev/null
+++ b/services/core/java/com/android/server/storage/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/os/storage/OWNERS
diff --git a/services/core/java/com/android/server/textclassifier/OWNERS b/services/core/java/com/android/server/textclassifier/OWNERS
new file mode 100644
index 000000000000..46b3cb8824a0
--- /dev/null
+++ b/services/core/java/com/android/server/textclassifier/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/textclassifier/OWNERS
diff --git a/services/core/java/com/android/server/timedetector/OWNERS b/services/core/java/com/android/server/timedetector/OWNERS
new file mode 100644
index 000000000000..09447a971bdd
--- /dev/null
+++ b/services/core/java/com/android/server/timedetector/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/timezone/OWNERS
diff --git a/services/core/java/com/android/server/timezone/OWNERS b/services/core/java/com/android/server/timezone/OWNERS
new file mode 100644
index 000000000000..09447a971bdd
--- /dev/null
+++ b/services/core/java/com/android/server/timezone/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/timezone/OWNERS
diff --git a/services/core/java/com/android/server/timezonedetector/OWNERS b/services/core/java/com/android/server/timezonedetector/OWNERS
new file mode 100644
index 000000000000..09447a971bdd
--- /dev/null
+++ b/services/core/java/com/android/server/timezonedetector/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/timezone/OWNERS
diff --git a/services/core/java/com/android/server/trust/OWNERS b/services/core/java/com/android/server/trust/OWNERS
new file mode 100644
index 000000000000..b039c4b45447
--- /dev/null
+++ b/services/core/java/com/android/server/trust/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/trust/OWNERS
diff --git a/services/core/java/com/android/server/tv/OWNERS b/services/core/java/com/android/server/tv/OWNERS
new file mode 100644
index 000000000000..305027ce077f
--- /dev/null
+++ b/services/core/java/com/android/server/tv/OWNERS
@@ -0,0 +1 @@
+include /media/java/android/media/tv/OWNERS
diff --git a/services/core/java/com/android/server/wallpaper/OWNERS b/services/core/java/com/android/server/wallpaper/OWNERS
new file mode 100644
index 000000000000..8ff0f74202f8
--- /dev/null
+++ b/services/core/java/com/android/server/wallpaper/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/wallpaper/OWNERS
diff --git a/services/core/jni/OWNERS b/services/core/jni/OWNERS
index 8646a53f3390..389d07ae34b5 100644
--- a/services/core/jni/OWNERS
+++ b/services/core/jni/OWNERS
@@ -11,3 +11,18 @@ per-file com_android_server_input_InputManagerService.cpp = michaelwr@google.com
 per-file com_android_server_HardwarePropertiesManagerService.cpp = michaelwr@google.com, santoscordon@google.com
 per-file com_android_server_power_PowerManagerService.* = michaelwr@google.com, santoscordon@google.com
 
+per-file Android.bp = file:platform/build/soong:/OWNERS
+per-file com_android_server_Usb* = file:/services/usb/OWNERS
+per-file com_android_server_Vibrator* = file:/services/core/java/com/android/server/vibrator/OWNERS
+per-file com_android_server_hdmi_* = file:/core/java/android/hardware/hdmi/OWNERS
+per-file com_android_server_input_* = file:/core/java/android/hardware/input/OWNERS
+per-file com_android_server_lights_* = file:/services/core/java/com/android/server/lights/OWNERS
+per-file com_android_server_location_* = file:/location/java/android/location/OWNERS
+per-file com_android_server_locksettings_* = file:/services/core/java/com/android/server/locksettings/OWNERS
+per-file com_android_server_net_* = file:/services/core/java/com/android/server/net/OWNERS
+per-file com_android_server_pm_* = file:/services/core/java/com/android/server/pm/OWNERS
+per-file com_android_server_power_* = file:/services/core/java/com/android/server/power/OWNERS
+per-file com_android_server_se_* = file:/core/java/android/se/OWNERS
+per-file com_android_server_security_* = file:/core/java/android/security/OWNERS
+per-file com_android_server_tv_* = file:/media/java/android/media/tv/OWNERS
+per-file com_android_server_vibrator_* = file:/services/core/java/com/android/server/vibrator/OWNERS
diff --git a/services/core/jni/gnss/OWNERS b/services/core/jni/gnss/OWNERS
new file mode 100644
index 000000000000..5ac6028411f0
--- /dev/null
+++ b/services/core/jni/gnss/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/location/OWNERS
diff --git a/services/core/xsd/platform-compat-schema/OWNERS b/services/core/xsd/platform-compat-schema/OWNERS
new file mode 100644
index 000000000000..f8c3520e9fa8
--- /dev/null
+++ b/services/core/xsd/platform-compat-schema/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/compat/OWNERS
diff --git a/services/devicepolicy/OWNERS b/services/devicepolicy/OWNERS
new file mode 100644
index 000000000000..e95633abe79a
--- /dev/null
+++ b/services/devicepolicy/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/admin/OWNERS
diff --git a/services/incremental/OWNERS b/services/incremental/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/services/incremental/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/services/print/OWNERS b/services/print/OWNERS
new file mode 100644
index 000000000000..2c7b881faf0f
--- /dev/null
+++ b/services/print/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/print/OWNERS
diff --git a/services/restrictions/OWNERS b/services/restrictions/OWNERS
new file mode 100644
index 000000000000..95e614c8a1bc
--- /dev/null
+++ b/services/restrictions/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/restrictions/OWNERS
diff --git a/services/robotests/backup/OWNERS b/services/robotests/backup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/services/robotests/backup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/services/robotests/src/com/android/server/backup/OWNERS b/services/robotests/src/com/android/server/backup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/services/robotests/src/com/android/server/backup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/services/robotests/src/com/android/server/pm/OWNERS b/services/robotests/src/com/android/server/pm/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/services/robotests/src/com/android/server/pm/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/services/startop/OWNERS b/services/startop/OWNERS
new file mode 100644
index 000000000000..bd3d829ed89f
--- /dev/null
+++ b/services/startop/OWNERS
@@ -0,0 +1 @@
+include /startop/OWNERS
diff --git a/services/tests/PackageManager/OWNERS b/services/tests/PackageManager/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/services/tests/PackageManager/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/services/tests/PackageManagerComponentOverrideTests/OWNERS b/services/tests/PackageManagerComponentOverrideTests/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/services/tests/PackageManagerComponentOverrideTests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/services/tests/mockingservicestests/assets/AppOpsUpgradeTest/OWNERS b/services/tests/mockingservicestests/assets/AppOpsUpgradeTest/OWNERS
new file mode 100644
index 000000000000..999ea0e62a0a
--- /dev/null
+++ b/services/tests/mockingservicestests/assets/AppOpsUpgradeTest/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/permission/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/OWNERS b/services/tests/mockingservicestests/src/com/android/server/OWNERS
new file mode 100644
index 000000000000..e779e21bb987
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/OWNERS
@@ -0,0 +1 @@
+per-file *Alarm* = file:/apex/jobscheduler/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/alarm/OWNERS b/services/tests/mockingservicestests/src/com/android/server/alarm/OWNERS
new file mode 100644
index 000000000000..6f207fb1a00e
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/alarm/OWNERS
@@ -0,0 +1 @@
+include /apex/jobscheduler/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/am/OWNERS b/services/tests/mockingservicestests/src/com/android/server/am/OWNERS
new file mode 100644
index 000000000000..72c0a9e6e90c
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/am/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/am/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/appop/OWNERS b/services/tests/mockingservicestests/src/com/android/server/appop/OWNERS
new file mode 100644
index 000000000000..999ea0e62a0a
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/appop/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/permission/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/blob/OWNERS b/services/tests/mockingservicestests/src/com/android/server/blob/OWNERS
new file mode 100644
index 000000000000..65bb6b8a5423
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/blob/OWNERS
@@ -0,0 +1 @@
+include /apex/blobstore/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/display/OWNERS b/services/tests/mockingservicestests/src/com/android/server/display/OWNERS
new file mode 100644
index 000000000000..6ce1ee4d3de2
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/display/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/display/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/job/OWNERS b/services/tests/mockingservicestests/src/com/android/server/job/OWNERS
new file mode 100644
index 000000000000..6f207fb1a00e
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/job/OWNERS
@@ -0,0 +1 @@
+include /apex/jobscheduler/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/power/OWNERS b/services/tests/mockingservicestests/src/com/android/server/power/OWNERS
new file mode 100644
index 000000000000..d68066bb8c40
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/power/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/power/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/usage/OWNERS b/services/tests/mockingservicestests/src/com/android/server/usage/OWNERS
new file mode 100644
index 000000000000..d3227de87684
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/usage/OWNERS
@@ -0,0 +1 @@
+include /services/usage/OWNERS
diff --git a/services/tests/mockingservicestests/src/com/android/server/wallpaper/OWNERS b/services/tests/mockingservicestests/src/com/android/server/wallpaper/OWNERS
new file mode 100644
index 000000000000..8ff0f74202f8
--- /dev/null
+++ b/services/tests/mockingservicestests/src/com/android/server/wallpaper/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/wallpaper/OWNERS
diff --git a/services/tests/servicestests/apks/OWNERS b/services/tests/servicestests/apks/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/services/tests/servicestests/apks/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/services/tests/servicestests/assets/NetworkPolicy/OWNERS b/services/tests/servicestests/assets/NetworkPolicy/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/services/tests/servicestests/assets/NetworkPolicy/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/OWNERS b/services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/services/tests/servicestests/assets/NetworkPolicyManagerServiceTest/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/OWNERS b/services/tests/servicestests/src/com/android/server/OWNERS
new file mode 100644
index 000000000000..6153db323f12
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/OWNERS
@@ -0,0 +1,6 @@
+per-file *Alarm* = file:/apex/jobscheduler/OWNERS
+per-file *AppOps* = file:/core/java/android/permission/OWNERS
+per-file *Bluetooth* = file:/core/java/android/bluetooth/OWNERS
+per-file *Gnss* = file:/services/core/java/com/android/server/location/OWNERS
+per-file *Network* = file:/services/core/java/com/android/server/net/OWNERS
+per-file *Vibrator* = file:/services/core/java/com/android/server/vibrator/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/OWNERS b/services/tests/servicestests/src/com/android/server/accessibility/OWNERS
new file mode 100644
index 000000000000..b74281edbf52
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/accessibility/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/accessibility/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/accounts/OWNERS b/services/tests/servicestests/src/com/android/server/accounts/OWNERS
new file mode 100644
index 000000000000..df1b4f432cd6
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/accounts/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/accounts/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/adb/OWNERS b/services/tests/servicestests/src/com/android/server/adb/OWNERS
new file mode 100644
index 000000000000..b97f7956d115
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/adb/OWNERS
@@ -0,0 +1 @@
+include platform/packages/modules/adb:/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/am/OWNERS b/services/tests/servicestests/src/com/android/server/am/OWNERS
new file mode 100644
index 000000000000..72c0a9e6e90c
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/am/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/am/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/appop/OWNERS b/services/tests/servicestests/src/com/android/server/appop/OWNERS
new file mode 100644
index 000000000000..999ea0e62a0a
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/appop/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/permission/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/appsearch/OWNERS b/services/tests/servicestests/src/com/android/server/appsearch/OWNERS
new file mode 100644
index 000000000000..ebe9e4ec087f
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/appsearch/OWNERS
@@ -0,0 +1 @@
+include /apex/appsearch/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/attention/OWNERS b/services/tests/servicestests/src/com/android/server/attention/OWNERS
new file mode 100644
index 000000000000..51fc9bd09e4f
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/attention/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/attention/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/backup/OWNERS b/services/tests/servicestests/src/com/android/server/backup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/backup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/compat/OWNERS b/services/tests/servicestests/src/com/android/server/compat/OWNERS
new file mode 100644
index 000000000000..f8c3520e9fa8
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/compat/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/compat/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/OWNERS b/services/tests/servicestests/src/com/android/server/devicepolicy/OWNERS
new file mode 100644
index 000000000000..e95633abe79a
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/admin/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/devicestate/OWNERS b/services/tests/servicestests/src/com/android/server/devicestate/OWNERS
new file mode 100644
index 000000000000..d9b0e2e5ffa5
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/devicestate/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/devicestate/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/display/OWNERS b/services/tests/servicestests/src/com/android/server/display/OWNERS
new file mode 100644
index 000000000000..6ce1ee4d3de2
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/display/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/display/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/hdmi/OWNERS b/services/tests/servicestests/src/com/android/server/hdmi/OWNERS
new file mode 100644
index 000000000000..c3c47eda59d7
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/hdmi/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/hardware/hdmi/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/input/OWNERS b/services/tests/servicestests/src/com/android/server/input/OWNERS
new file mode 100644
index 000000000000..d701f23cb9b8
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/input/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/hardware/input/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/inputmethod/OWNERS b/services/tests/servicestests/src/com/android/server/inputmethod/OWNERS
new file mode 100644
index 000000000000..5deb2ce8f24b
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/inputmethod/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/inputmethod/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/integrity/OWNERS b/services/tests/servicestests/src/com/android/server/integrity/OWNERS
new file mode 100644
index 000000000000..653d1c969528
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/integrity/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/integrity/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/job/OWNERS b/services/tests/servicestests/src/com/android/server/job/OWNERS
new file mode 100644
index 000000000000..6f207fb1a00e
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/job/OWNERS
@@ -0,0 +1 @@
+include /apex/jobscheduler/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/lights/OWNERS b/services/tests/servicestests/src/com/android/server/lights/OWNERS
new file mode 100644
index 000000000000..cb46a80d9b60
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/lights/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/lights/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/locksettings/OWNERS b/services/tests/servicestests/src/com/android/server/locksettings/OWNERS
new file mode 100644
index 000000000000..0a8dc8c45a9f
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/locksettings/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/locksettings/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/net/OWNERS b/services/tests/servicestests/src/com/android/server/net/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/net/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/om/OWNERS b/services/tests/servicestests/src/com/android/server/om/OWNERS
new file mode 100644
index 000000000000..afb98d416762
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/om/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/content/om/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/people/OWNERS b/services/tests/servicestests/src/com/android/server/people/OWNERS
new file mode 100644
index 000000000000..3198a5e84307
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/people/OWNERS
@@ -0,0 +1 @@
+include /services/people/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/pm/OWNERS b/services/tests/servicestests/src/com/android/server/pm/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/pm/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/policy/OWNERS b/services/tests/servicestests/src/com/android/server/policy/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/policy/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/power/OWNERS b/services/tests/servicestests/src/com/android/server/power/OWNERS
new file mode 100644
index 000000000000..d68066bb8c40
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/power/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/power/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/powerstats/OWNERS b/services/tests/servicestests/src/com/android/server/powerstats/OWNERS
new file mode 100644
index 000000000000..d68066bb8c40
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/powerstats/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/power/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/rollback/OWNERS b/services/tests/servicestests/src/com/android/server/rollback/OWNERS
new file mode 100644
index 000000000000..d04a70619caa
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/rollback/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/rollback/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/OWNERS b/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/OWNERS
new file mode 100644
index 000000000000..816bc6bba639
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/soundtrigger_middleware/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/media/soundtrigger/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/stats/OWNERS b/services/tests/servicestests/src/com/android/server/stats/OWNERS
new file mode 100644
index 000000000000..ee865b1e4ec8
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/stats/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/stats/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/storage/OWNERS b/services/tests/servicestests/src/com/android/server/storage/OWNERS
new file mode 100644
index 000000000000..6f9dbea36b06
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/storage/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/os/storage/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/textclassifier/OWNERS b/services/tests/servicestests/src/com/android/server/textclassifier/OWNERS
new file mode 100644
index 000000000000..46b3cb8824a0
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/textclassifier/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/textclassifier/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/timedetector/OWNERS b/services/tests/servicestests/src/com/android/server/timedetector/OWNERS
new file mode 100644
index 000000000000..09447a971bdd
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/timedetector/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/timezone/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/timezone/OWNERS b/services/tests/servicestests/src/com/android/server/timezone/OWNERS
new file mode 100644
index 000000000000..09447a971bdd
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/timezone/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/timezone/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/timezonedetector/OWNERS b/services/tests/servicestests/src/com/android/server/timezonedetector/OWNERS
new file mode 100644
index 000000000000..09447a971bdd
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/timezonedetector/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/timezone/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/tv/OWNERS b/services/tests/servicestests/src/com/android/server/tv/OWNERS
new file mode 100644
index 000000000000..305027ce077f
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/tv/OWNERS
@@ -0,0 +1 @@
+include /media/java/android/media/tv/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/uri/OWNERS b/services/tests/servicestests/src/com/android/server/uri/OWNERS
new file mode 100644
index 000000000000..ca5d5f9803e3
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/uri/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/uri/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/usage/OWNERS b/services/tests/servicestests/src/com/android/server/usage/OWNERS
new file mode 100644
index 000000000000..d3227de87684
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/usage/OWNERS
@@ -0,0 +1 @@
+include /services/usage/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/vibrator/OWNERS b/services/tests/servicestests/src/com/android/server/vibrator/OWNERS
new file mode 100644
index 000000000000..cc63ceb2c7ad
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/vibrator/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/vibrator/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/wallpaper/OWNERS b/services/tests/servicestests/src/com/android/server/wallpaper/OWNERS
new file mode 100644
index 000000000000..8ff0f74202f8
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/wallpaper/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/wallpaper/OWNERS
diff --git a/services/tests/servicestests/test-apps/JobTestApp/OWNERS b/services/tests/servicestests/test-apps/JobTestApp/OWNERS
new file mode 100644
index 000000000000..6f207fb1a00e
--- /dev/null
+++ b/services/tests/servicestests/test-apps/JobTestApp/OWNERS
@@ -0,0 +1 @@
+include /apex/jobscheduler/OWNERS
diff --git a/services/tests/servicestests/test-apps/PackageParserApp/OWNERS b/services/tests/servicestests/test-apps/PackageParserApp/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/services/tests/servicestests/test-apps/PackageParserApp/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/services/tests/servicestests/test-apps/PackageParsingTestManifests/OWNERS b/services/tests/servicestests/test-apps/PackageParsingTestManifests/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/services/tests/servicestests/test-apps/PackageParsingTestManifests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/services/tests/uiservicestests/src/com/android/server/OWNERS b/services/tests/uiservicestests/src/com/android/server/OWNERS
new file mode 100644
index 000000000000..05944c03c638
--- /dev/null
+++ b/services/tests/uiservicestests/src/com/android/server/OWNERS
@@ -0,0 +1 @@
+per-file UiModeManagerServiceTest.java = file:/packages/SystemUI/OWNERS
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/OWNERS b/services/tests/uiservicestests/src/com/android/server/notification/OWNERS
new file mode 100644
index 000000000000..396fd1213aca
--- /dev/null
+++ b/services/tests/uiservicestests/src/com/android/server/notification/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/notification/OWNERS
diff --git a/services/tests/uiservicestests/src/com/android/server/slice/OWNERS b/services/tests/uiservicestests/src/com/android/server/slice/OWNERS
new file mode 100644
index 000000000000..3d0859f6f701
--- /dev/null
+++ b/services/tests/uiservicestests/src/com/android/server/slice/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/app/slice/OWNERS
diff --git a/services/tests/wmtests/OWNERS b/services/tests/wmtests/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/services/tests/wmtests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/services/voiceinteraction/OWNERS b/services/voiceinteraction/OWNERS
new file mode 100644
index 000000000000..ef1061b28b63
--- /dev/null
+++ b/services/voiceinteraction/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/voice/OWNERS
diff --git a/services/wifi/OWNERS b/services/wifi/OWNERS
new file mode 100644
index 000000000000..2ae7065211d4
--- /dev/null
+++ b/services/wifi/OWNERS
@@ -0,0 +1 @@
+include /wifi/OWNERS
diff --git a/tests/ActivityManagerPerfTests/OWNERS b/tests/ActivityManagerPerfTests/OWNERS
new file mode 100644
index 000000000000..72c0a9e6e90c
--- /dev/null
+++ b/tests/ActivityManagerPerfTests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/am/OWNERS
diff --git a/tests/AmSlam/OWNERS b/tests/AmSlam/OWNERS
new file mode 100644
index 000000000000..72c0a9e6e90c
--- /dev/null
+++ b/tests/AmSlam/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/am/OWNERS
diff --git a/tests/BlobStoreTestUtils/OWNERS b/tests/BlobStoreTestUtils/OWNERS
new file mode 100644
index 000000000000..65bb6b8a5423
--- /dev/null
+++ b/tests/BlobStoreTestUtils/OWNERS
@@ -0,0 +1 @@
+include /apex/blobstore/OWNERS
diff --git a/tests/Camera2Tests/OWNERS b/tests/Camera2Tests/OWNERS
new file mode 100644
index 000000000000..f48a95c5b3a3
--- /dev/null
+++ b/tests/Camera2Tests/OWNERS
@@ -0,0 +1 @@
+include platform/frameworks/av:/camera/OWNERS
diff --git a/tests/CanvasCompare/OWNERS b/tests/CanvasCompare/OWNERS
new file mode 100644
index 000000000000..c88a9f82c347
--- /dev/null
+++ b/tests/CanvasCompare/OWNERS
@@ -0,0 +1 @@
+include /libs/hwui/OWNERS
diff --git a/tests/Compatibility/OWNERS b/tests/Compatibility/OWNERS
new file mode 100644
index 000000000000..f8c3520e9fa8
--- /dev/null
+++ b/tests/Compatibility/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/compat/OWNERS
diff --git a/tests/DozeTest/OWNERS b/tests/DozeTest/OWNERS
new file mode 100644
index 000000000000..2e96c97c8bb3
--- /dev/null
+++ b/tests/DozeTest/OWNERS
@@ -0,0 +1 @@
+include /packages/SystemUI/OWNERS
diff --git a/tests/FixVibrateSetting/OWNERS b/tests/FixVibrateSetting/OWNERS
new file mode 100644
index 000000000000..cc63ceb2c7ad
--- /dev/null
+++ b/tests/FixVibrateSetting/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/vibrator/OWNERS
diff --git a/tests/FlickerTests/OWNERS b/tests/FlickerTests/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/tests/FlickerTests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/tests/HugeBackup/OWNERS b/tests/HugeBackup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/tests/HugeBackup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/tests/HwAccelerationTest/OWNERS b/tests/HwAccelerationTest/OWNERS
new file mode 100644
index 000000000000..c88a9f82c347
--- /dev/null
+++ b/tests/HwAccelerationTest/OWNERS
@@ -0,0 +1 @@
+include /libs/hwui/OWNERS
diff --git a/tests/Input/OWNERS b/tests/Input/OWNERS
new file mode 100644
index 000000000000..d701f23cb9b8
--- /dev/null
+++ b/tests/Input/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/hardware/input/OWNERS
diff --git a/tests/JobSchedulerPerfTests/OWNERS b/tests/JobSchedulerPerfTests/OWNERS
new file mode 100644
index 000000000000..6f207fb1a00e
--- /dev/null
+++ b/tests/JobSchedulerPerfTests/OWNERS
@@ -0,0 +1 @@
+include /apex/jobscheduler/OWNERS
diff --git a/tests/JobSchedulerTestApp/OWNERS b/tests/JobSchedulerTestApp/OWNERS
new file mode 100644
index 000000000000..6f207fb1a00e
--- /dev/null
+++ b/tests/JobSchedulerTestApp/OWNERS
@@ -0,0 +1 @@
+include /apex/jobscheduler/OWNERS
diff --git a/tests/LocationTracker/OWNERS b/tests/LocationTracker/OWNERS
new file mode 100644
index 000000000000..5ac6028411f0
--- /dev/null
+++ b/tests/LocationTracker/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/location/OWNERS
diff --git a/tests/LowStorageTest/OWNERS b/tests/LowStorageTest/OWNERS
new file mode 100644
index 000000000000..6f9dbea36b06
--- /dev/null
+++ b/tests/LowStorageTest/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/os/storage/OWNERS
diff --git a/tests/NetworkSecurityConfigTest/OWNERS b/tests/NetworkSecurityConfigTest/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/tests/NetworkSecurityConfigTest/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/tests/PackageWatchdog/OWNERS b/tests/PackageWatchdog/OWNERS
new file mode 100644
index 000000000000..d04a70619caa
--- /dev/null
+++ b/tests/PackageWatchdog/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/rollback/OWNERS
diff --git a/tests/PackageWatchdog/src/com/android/server/OWNERS b/tests/PackageWatchdog/src/com/android/server/OWNERS
new file mode 100644
index 000000000000..5cf4dcf92048
--- /dev/null
+++ b/tests/PackageWatchdog/src/com/android/server/OWNERS
@@ -0,0 +1 @@
+per-file PackageWatchdogTest.java = file:/services/core/java/com/android/server/rollback/OWNERS
diff --git a/tests/PlatformCompatGating/OWNERS b/tests/PlatformCompatGating/OWNERS
new file mode 100644
index 000000000000..f8c3520e9fa8
--- /dev/null
+++ b/tests/PlatformCompatGating/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/compat/OWNERS
diff --git a/tests/RollbackTest/OWNERS b/tests/RollbackTest/OWNERS
new file mode 100644
index 000000000000..d04a70619caa
--- /dev/null
+++ b/tests/RollbackTest/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/rollback/OWNERS
diff --git a/tests/SoundTriggerTestApp/OWNERS b/tests/SoundTriggerTestApp/OWNERS
new file mode 100644
index 000000000000..816bc6bba639
--- /dev/null
+++ b/tests/SoundTriggerTestApp/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/media/soundtrigger/OWNERS
diff --git a/tests/SoundTriggerTests/OWNERS b/tests/SoundTriggerTests/OWNERS
new file mode 100644
index 000000000000..816bc6bba639
--- /dev/null
+++ b/tests/SoundTriggerTests/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/media/soundtrigger/OWNERS
diff --git a/tests/StagedInstallTest/OWNERS b/tests/StagedInstallTest/OWNERS
new file mode 100644
index 000000000000..d825dfd7cf00
--- /dev/null
+++ b/tests/StagedInstallTest/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/pm/OWNERS
diff --git a/tests/StatusBar/OWNERS b/tests/StatusBar/OWNERS
new file mode 100644
index 000000000000..2e96c97c8bb3
--- /dev/null
+++ b/tests/StatusBar/OWNERS
@@ -0,0 +1 @@
+include /packages/SystemUI/OWNERS
diff --git a/tests/TaskOrganizerTest/OWNERS b/tests/TaskOrganizerTest/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/tests/TaskOrganizerTest/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/tests/TelephonyCommonTests/OWNERS b/tests/TelephonyCommonTests/OWNERS
new file mode 100644
index 000000000000..640baf2297b4
--- /dev/null
+++ b/tests/TelephonyCommonTests/OWNERS
@@ -0,0 +1 @@
+include /telephony/OWNERS
diff --git a/tests/UsageReportingTest/OWNERS b/tests/UsageReportingTest/OWNERS
new file mode 100644
index 000000000000..d3227de87684
--- /dev/null
+++ b/tests/UsageReportingTest/OWNERS
@@ -0,0 +1 @@
+include /services/usage/OWNERS
diff --git a/tests/UsageStatsPerfTests/OWNERS b/tests/UsageStatsPerfTests/OWNERS
new file mode 100644
index 000000000000..d3227de87684
--- /dev/null
+++ b/tests/UsageStatsPerfTests/OWNERS
@@ -0,0 +1 @@
+include /services/usage/OWNERS
diff --git a/tests/UsageStatsTest/OWNERS b/tests/UsageStatsTest/OWNERS
new file mode 100644
index 000000000000..d3227de87684
--- /dev/null
+++ b/tests/UsageStatsTest/OWNERS
@@ -0,0 +1 @@
+include /services/usage/OWNERS
diff --git a/tests/UsbHostExternalManagmentTest/OWNERS b/tests/UsbHostExternalManagmentTest/OWNERS
new file mode 100644
index 000000000000..f7b2a37a297a
--- /dev/null
+++ b/tests/UsbHostExternalManagmentTest/OWNERS
@@ -0,0 +1 @@
+include /services/usb/OWNERS
diff --git a/tests/UsbManagerTests/OWNERS b/tests/UsbManagerTests/OWNERS
new file mode 100644
index 000000000000..f7b2a37a297a
--- /dev/null
+++ b/tests/UsbManagerTests/OWNERS
@@ -0,0 +1 @@
+include /services/usb/OWNERS
diff --git a/tests/UsbTests/OWNERS b/tests/UsbTests/OWNERS
new file mode 100644
index 000000000000..f7b2a37a297a
--- /dev/null
+++ b/tests/UsbTests/OWNERS
@@ -0,0 +1 @@
+include /services/usb/OWNERS
diff --git a/tests/VoiceInteraction/OWNERS b/tests/VoiceInteraction/OWNERS
new file mode 100644
index 000000000000..ef1061b28b63
--- /dev/null
+++ b/tests/VoiceInteraction/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/service/voice/OWNERS
diff --git a/tests/WindowAnimationJank/OWNERS b/tests/WindowAnimationJank/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/tests/WindowAnimationJank/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/tests/WindowInsetsTests/OWNERS b/tests/WindowInsetsTests/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/tests/WindowInsetsTests/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/tests/backup/OWNERS b/tests/backup/OWNERS
new file mode 100644
index 000000000000..d99779e3d9da
--- /dev/null
+++ b/tests/backup/OWNERS
@@ -0,0 +1 @@
+include /services/backup/OWNERS
diff --git a/tests/benchmarks/src/com/android/server/net/OWNERS b/tests/benchmarks/src/com/android/server/net/OWNERS
new file mode 100644
index 000000000000..aa87958f1d53
--- /dev/null
+++ b/tests/benchmarks/src/com/android/server/net/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/net/OWNERS
diff --git a/tests/notification/OWNERS b/tests/notification/OWNERS
new file mode 100644
index 000000000000..396fd1213aca
--- /dev/null
+++ b/tests/notification/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/notification/OWNERS
diff --git a/tests/permission/OWNERS b/tests/permission/OWNERS
new file mode 100644
index 000000000000..999ea0e62a0a
--- /dev/null
+++ b/tests/permission/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/permission/OWNERS
diff --git a/tests/utils/DummyIME/OWNERS b/tests/utils/DummyIME/OWNERS
new file mode 100644
index 000000000000..5deb2ce8f24b
--- /dev/null
+++ b/tests/utils/DummyIME/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/inputmethod/OWNERS
diff --git a/tests/utils/StubIME/OWNERS b/tests/utils/StubIME/OWNERS
new file mode 100644
index 000000000000..5deb2ce8f24b
--- /dev/null
+++ b/tests/utils/StubIME/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/inputmethod/OWNERS
diff --git a/tests/utils/hostutils/src/com/android/tests/rollback/OWNERS b/tests/utils/hostutils/src/com/android/tests/rollback/OWNERS
new file mode 100644
index 000000000000..d04a70619caa
--- /dev/null
+++ b/tests/utils/hostutils/src/com/android/tests/rollback/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/rollback/OWNERS
diff --git a/tests/utils/testutils/java/com/android/server/accessibility/OWNERS b/tests/utils/testutils/java/com/android/server/accessibility/OWNERS
new file mode 100644
index 000000000000..b74281edbf52
--- /dev/null
+++ b/tests/utils/testutils/java/com/android/server/accessibility/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/view/accessibility/OWNERS
diff --git a/tests/utils/testutils/java/com/android/server/wm/OWNERS b/tests/utils/testutils/java/com/android/server/wm/OWNERS
new file mode 100644
index 000000000000..0862c05e0ee4
--- /dev/null
+++ b/tests/utils/testutils/java/com/android/server/wm/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/wm/OWNERS
diff --git a/tools/aapt/OWNERS b/tools/aapt/OWNERS
new file mode 100644
index 000000000000..c232ccd457a7
--- /dev/null
+++ b/tools/aapt/OWNERS
@@ -0,0 +1 @@
+include /tools/aapt2/OWNERS
diff --git a/tools/fonts/OWNERS b/tools/fonts/OWNERS
new file mode 100644
index 000000000000..a538331dd3f4
--- /dev/null
+++ b/tools/fonts/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/graphics/fonts/OWNERS
diff --git a/tools/incident_report/OWNERS b/tools/incident_report/OWNERS
new file mode 100644
index 000000000000..f76611555dbb
--- /dev/null
+++ b/tools/incident_report/OWNERS
@@ -0,0 +1 @@
+include /cmds/incidentd/OWNERS
diff --git a/tools/incident_section_gen/OWNERS b/tools/incident_section_gen/OWNERS
new file mode 100644
index 000000000000..f76611555dbb
--- /dev/null
+++ b/tools/incident_section_gen/OWNERS
@@ -0,0 +1 @@
+include /cmds/incidentd/OWNERS
diff --git a/tools/powerstats/OWNERS b/tools/powerstats/OWNERS
new file mode 100644
index 000000000000..d68066bb8c40
--- /dev/null
+++ b/tools/powerstats/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/power/OWNERS
-- 
GitLab