Merge "Updated test owners" into main am: 39841fec89 am: 453a68d8f8

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

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