Merge "Merge "Add ADPF owners to performance hint files" into main am: 97058d4c2d am: 903345de12" into udc-dev-plus-aosp am: 50c0203ef1 am: 348d7e0b97 am: a26dc3f02b

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

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