Merge "Temporarily reduced owners during refactoring" am: 7f70f833 am:...

Merge "Temporarily reduced owners during refactoring" am: 7f70f833 am: b6655887 am: 368e5d91 am: b590a991

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2184651



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