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

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

Change-Id: I4a1666a3b536460899f11a55d69e4f5a5b77ec8d