DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1c0 am: e2c8878455

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

Change-Id: Id9cdb36e1d80834c403b6c2afdca3d149489f2de