[automerger skipped] Merge "Rename setAccessUids to setAllowedUids" am:...

[automerger skipped] Merge "Rename setAccessUids to setAllowedUids" am: e435ee97 am: 927810c4 am: 58df7147 -s ours am: 8cfa9878 -s ours

am skip reason: Merged-In I0704eeebc2d74a338d23a57e1313df864c84a17f with SHA-1 3f7cdf4a is already in history

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

Change-Id: I7eacbe2d4625580df050dd73fb10052493d89cd8