Merge "Revert "Rename checkSystemBarServicePermission"" into main