Do not remove location permissions on Q-beta OTAs

The Q SDK version is not yet defined. Hence every time an OTA happens
the previous version of the package settings file is '28' which is less
than Build.VERSION_CODES.Q==10000. Hence before we ran the p->q upgrade
code for ever Q-beta OTA.

One upgrade step is to remove all location permission grants. I.e.
currently we remove all location permission grant on everye Q-beta OTA,
which is annoying.

Once Q is defined at 29, the package settings file will update to
version==29. At this time we will run the p->q upgrade code one more
time, but this is the last time.

Fixes: 129132948
Test: Simulated OTA and saw location permissions not removed.
Change-Id: I667b7fe345335adfbefea3e6f93401e59b1ce42b