Merge "Fix ownership for ComponentOptions" into main am: 54ac60b81d

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

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