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