Force another loc perm expansion

by moving it later. This change by itself does nothing, but we can
temporarily remove the sdkUpgradedFromP to force this change onto
everybody including people upgrading from Q to Q.

Bug: 118661683
Test: Upgraded from P->Q and saw location permission expanded.
Change-Id: Iaa32507547da19cfb00d6376035f904bd92913aa