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

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

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