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

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

Change-Id: I6b3d6e34e4cebe059914b7956b19f03de4c75f6c