Revert "gps: Update to CAF jb_2.3.2, reenable privacy lock."

This reverts commit 7717e783826fc7fcc76d0da9ebae34df8146cb2c.