Merge "Removes WRITE_SECURE_SETTINGS from location bypass APIs" into tm-dev