tree eda1c89e885758448fc5b4d22c5f2c2c203ae2a5
parent 23b4bd372f8925d423b1a267b10193152c81a635
parent 84d6557c88088ab3f3fe024ff51d6d8d22723473
author Treehugger Robot <treehugger-gerrit@google.com> 1598477873 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598477873 +0000

[automerger skipped] Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig" am: d09cf27486 -s ours am: 7bdeaf1905 am: ed0a5432eb am: 84d6557c88

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

Change-Id: I95d2b2837a002ca27996cfc887a9b790add3f0bb