Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS""