Merge "kernel:  remove permissive_or_unconfined()"