Merge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:...

Merge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676ddd am: b5da08a2 am: d88f4b72 am: 5e76d546" into oc-dr1-dev-plus-aosp am: cb7faac0" into oc-mr1-dev-plus-aosp
am: 8154362f

Change-Id: I93b0a39d4dde739d08b1b05284351b532c946af0