Merge "Fixing orphaned component's OWNERS" into main am: 0eb0be0ff5 am: 3f80aef6db

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

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