Merge changes from topic "servicelocation" am: bf35744779 am: bdda52bc14 am: 5e51eaef1b am: d21c2b9eaf

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1356224

Change-Id: I1d820ca0fac3b940552fdda8b9ad9d412f9d8a1c