tree a7778aeb00e30e9e4292074add2fe86f185da2a4
parent d69ac21c67cd884001ef0f769ba507f5b00f6271
parent 9b1cd0daec1886c6425577f26d2c6412250f420b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594856190 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1594856190 +0000

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: 1b09322bc6 am: 699f5b0d50
  DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1c0 am: 5cda502532