Merge "Use settings flag to control HAL location request" into pi-dev
am: c9ae78dcde

Change-Id: I1b9f5ce5ab1d3f02a46764e230165d971eaebc0c