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

Change-Id: I75b5e782336ad85cb7475e94277ff970da109731