am b7ab3420: Ignore changes from open-source master that are already here

Merge commit 'b7ab342016bd622b30e1945b16b24413ae82ac54'

* commit 'b7ab342016bd622b30e1945b16b24413ae82ac54':
  GPS: Initialize XTRA support when GPS is enabled
  GPS: Don't set XTRA download pending flag at boot time.