Merge "Allow an SPL-gated permission to be added early." into oreo-cts-dev