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

This reverts commit 09447c454190345b191114b8121a34fd842f1b48.