Merge changes from topic "servicelocation" am: bf35744779

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

Change-Id: I80d476f5b19d02e92a33cae38e6da5d208888b51