Merge changes from topic "servicelocation" am: 63ced6b5 am: 0b41b930 am:...

Merge changes from topic "servicelocation" am: 63ced6b5 am: 0b41b930 am: dbe2b4c8 am: d307f437 am: 82f17301

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355808

Change-Id: Id7f6f8125ca3b648a62224593a33c82250258e7a