[automerger skipped] Merge "DO NOT MERGE: Fix NPE bug in LocationManager" into...

[automerger skipped] Merge "DO NOT MERGE: Fix NPE bug in LocationManager" into rvc-qpr-dev am: 70c29747 am: 6e8cb0d9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id324727091f72771bf94d4521ab9bd6243011bd3