Expand loc bg perm after grandfathering it

The loc bg perm is restricted. Hence it cannot be granted unless
whitelisted. Hence we need to grandfather==whitelist is before we try to
grand it later in the "Expanding location permissions" step.

Test: Upgraded P->Q and saw permissions expanded
Fixes: 118661683
Change-Id: Icf653eda9a51a9687d832ec225ccbe6a2c7686e9