[automerger skipped] Merge "Don't bootloop if GNSS is unavailable." into...

[automerger skipped] Merge "Don't bootloop if GNSS is unavailable." into tm-dev am: 92e68968 am: 50fbd739 -s ours am: 65832ae9 -s ours

am skip reason: Merged-In I0891812f6c83fb1f000d5aeccf5f6b9d2e197dc3 with SHA-1 eb7af16f is already in history

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



Change-Id: I1133be5a4ea63f4cf2230e7cb8157a57e5fa3115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>