Merge changes from topic "servicelocation" am: 63ced6b508 am: 0b41b930a8

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

Change-Id: I1992b4e1c9d7c2cf442515b4c397a9975478df85