Merge changes from topic 'am-de733d91cb0341aeb2ef16f880922bbc' into oc-mr1-dev-plus-aosp

* changes:
  Catch (and ignore) any timeout exceptions when releasing WakeLock am: 9468b485  -s ours am: 4542686e am: c915b7f7 am: 54ad8c1f am: b3803881
  Fix Wakelock underlock in GnssLocationProvider. am: 2ed01668  -s ours am: 5d60709d am: 17669d31 am: 5043ac7a am: 1b7fdf0f