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

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

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