Merge "Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev am: 34ab1f6a31" into oc-dev-plus-aosp
am: 444724c874

Change-Id: I6ed4d7216604c8bf71d31a9bcff826b2d05a0d16