Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322bc6

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

Change-Id: I48d10030609ee19d2763d5382c62e4c260b15a7d