Merge "Owners updates." am: 69cd3f8ab7 am: f39e3e24ac am: e8a7e5f991

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2497558

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