Merge "Merge "DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading...

Merge "Merge "DO NOT MERGE ANYWHERE: Add a wakelock timeout when downloading xtra data for GNSS. am: a763fdba  -s ours am: 452b8f2b  -s ours am: f173b2a4  -s ours am: 43712e24  -s ours" into oc-dr1-dev-plus-aosp am: ac712366  -s ours" into oc-mr1-dev-plus-aosp
am: 568771cf  -s ours

Change-Id: I0cfe84a914212a6771c9fbad0acb3976de7d9f2b