[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: 1ed4d9ab am: cc4f73b3 am: cf38c458 -s ours

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

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



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