Merge "Removing feature location_network from aosp_taimen" into pi-dev