Merge changes from topic "am-47da99b99c4047c98fbfc33f939b5089" into rvc-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322b am: 699f5b0d
DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1 am: 5cda5025