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

Original change: https://android-review.googlesource.com/c/platform/cts/+/1358809

Change-Id: I2ef527dc3e1b040e95e3943321e64e86b0cb6f4c