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

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

Change-Id: I2e49623477ad361f422fb8d79684e88eeb1eaca2