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

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

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