Ensure location package state set correctly

Ensures that the extra package does not accidentally fail to fall
through and uses the location provider state

Fixes: 145969187
Test: navigate to location permissions while location is enabled, but
location history is not. Location history should be listed as "deny"

Change-Id: I3ec95480ffde881453ab5c4f10d964f4f2ec277c