Merge "Fix issue #23214751: Get a GPS fix before going in to doze" into mnc-dev