[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: bb854132 am: d69ac21c am: 9160083b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie32b4fc3abbe2bfcac156aba240fa9f0e932fd1c