Merge "Avoid NullPointerException if Location manager is disabled" into main am: 0956846ea2

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

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