Merge "Removing feature location_network from aosp_taimen" into pi-dev
am: 0db0c95194

Change-Id: I527ac96eab2ab2ac198879ce1b48abf2dc9597af