[automerger skipped] Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to...

[automerger skipped] Merge "DO NOT MERGE: GNSS: Add a check of SIM presence to GnssConfig" am: d09cf274 -s ours am: 7bdeaf19 am: ed0a5432 am: 84d6557c am: b2344d6c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I827f0c2b53d86cb437a3e68d64b283d665a942a4