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

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



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