Merge changes from topic "servicelocation" am: 63ced6b508

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

Change-Id: Ib08f1ddac156e789aacc9420ecf4e51a5e5cea5a