[automerger skipped] Merge "Fixed that admin and owner uids are not set" am:...

[automerger skipped] Merge "Fixed that admin and owner uids are not set" am: 75440648 am: f4364998 am: c865880a -s ours am: 65f95733 -s ours

am skip reason: Merged-In I6bd9fcdcb54d27c652d5658c9ee6d5e046e6774b with SHA-1 5b8e2734 is already in history

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



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