Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev
am: b1f7358d98

Change-Id: I611cfae89e9d9e2be740cd8c130bf57bcf4cca11