Merge changes from topic "servicelocation" am: bf35744779 am: bdda52bc14

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

Change-Id: I442b23b169e87d0de77df3cbd40ad823e0d17c18