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

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

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