[automerger skipped] Merge "DO NOT MERGE: Always return non null from...

[automerger skipped] Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322b am: 699f5b0d am: 9b1cd0da am: e30fe784 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id84535fa7001e1edd6c827d2cd6c92b755c1b136