Merge "Check provider exists and is enabled when request location" into pi-dev am: 4c958d0e6b
am: 566987a3be

Change-Id: If27d5bbe87613a6c977787b668429359616391c1