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

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

Change-Id: If7e2aadbaa0c69f84f2db885b9ccbf3a898150c6