Merge "Merge "Restart location requests after HAL restarts" into tm-dev am:...

Merge "Merge "Restart location requests after HAL restarts" into tm-dev am: e19d5be9 am: d9d53d5f" into tm-d1-dev-plus-aosp am: 60365f01

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



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