Merge "Fix NPE in LocationProviderManager" into sc-dev am: 93f7083eab am: c5464d5882 am: e4d8c138b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14468644 Change-Id: I433f7be76ff0bec8f814162bbaf703618a54636f
This commit is contained in: