[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: 06f4a7e4 am: 479b0639 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2f37eccb780dc7aba4e84171ff8e6ab6c43fbdc0