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

Change-Id: I206e7a4a0ff3990ea8cf94decb6112c769e545f8