DO NOT MERGE: Fix NPE bug in LocationManager am: 6af009ab20

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

Change-Id: I3ed40fbbc8aaac40be939aaee45a3a2f2545ca50