Merge "Update lost mode location logic" into tm-dev am: 4ff9d8d3f7

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

Change-Id: I0648c1b05c411a3d4f569e7cbeee1305d1bd0eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>