Merge "Owners updates." am: 69cd3f8a am: f39e3e24 am: e8a7e5f9 am: 5b8016f3 am: f61dbc79

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



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