[automerger skipped] DO NOT MERGE: Fix NPE bug in LocationManager am: 6af009ab20 am: 5cadc74746 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12410211 Change-Id: I453c8d26b9bab389bfdb92661df089e72c0b832c
This commit is contained in: